[NET]: Introducing socket mark socket option.

[safe/jmp/linux-2.6] / include / asm-sh / bugs.h

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index b4000c8..def8128 100644 (file)
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -16,33 +16,52 @@
 
 static void __init check_bugs(void)
 {
-       extern char *get_cpu_subtype(void);
        extern unsigned long loops_per_jiffy;
-       char *p= &system_utsname.machine[2]; /* "sh" */
+       char *p = &init_utsname()->machine[2]; /* "sh" */
 
-       cpu_data->loops_per_jiffy = loops_per_jiffy;
+       current_cpu_data.loops_per_jiffy = loops_per_jiffy;
 
-       switch (cpu_data->type) {
-       case CPU_SH7604:
+       switch (current_cpu_data.type) {
+       case CPU_SH7619:
                *p++ = '2';
                break;
-       case CPU_SH7705 ... CPU_SH7300:
+       case CPU_SH7203 ... CPU_SH7263:
+               *p++ = '2';
+               *p++ = 'a';
+               break;
+       case CPU_SH7705 ... CPU_SH7729:
                *p++ = '3';
                break;
        case CPU_SH7750 ... CPU_SH4_501:
                *p++ = '4';
                break;
-       case CPU_SH7770 ... CPU_SH7781:
+       case CPU_SH7763 ... CPU_SHX3:
+               *p++ = '4';
+               *p++ = 'a';
+               break;
+       case CPU_SH7343 ... CPU_SH7722:
                *p++ = '4';
                *p++ = 'a';
+               *p++ = 'l';
+               *p++ = '-';
+               *p++ = 'd';
+               *p++ = 's';
+               *p++ = 'p';
+               break;
+       case CPU_SH5_101 ... CPU_SH5_103:
+               *p++ = '6';
+               *p++ = '4';
                break;
-       default:
-               *p++ = '?';
-               *p++ = '!';
+       case CPU_SH_NONE:
+               /*
+                * Specifically use CPU_SH_NONE rather than default:,
+                * so we're able to have the compiler whine about
+                * unhandled enumerations.
+                */
                break;
        }
 
-       printk("CPU: %s\n", get_cpu_subtype());
+       printk("CPU: %s\n", get_cpu_subtype(&current_cpu_data));
 
 #ifndef __LITTLE_ENDIAN__
        /* 'eb' means 'Endian Big' */