Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[sfrench/cifs-2.6.git] / include / asm-sh / bugs.h

diff --git a/include/asm-sh/bugs.h b/include/asm-sh/bugs.h
index a294997a84127b02e42174dcb670e17629ab1392..b66139ff73fce2fb8d65909e2ef561937ca2f958 100644 (file)
--- a/include/asm-sh/bugs.h
+++ b/include/asm-sh/bugs.h
@@ -19,27 +19,27 @@ static void __init check_bugs(void)
        extern unsigned long loops_per_jiffy;
        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 ... CPU_SH7619:
+       switch (current_cpu_data.type) {
+       case CPU_SH7619:
                *p++ = '2';
                break;
        case CPU_SH7206:
                *p++ = '2';
                *p++ = 'a';
                break;
-       case CPU_SH7705 ... CPU_SH7300:
+       case CPU_SH7705 ... CPU_SH7729:
                *p++ = '3';
                break;
        case CPU_SH7750 ... CPU_SH4_501:
                *p++ = '4';
                break;
-       case CPU_SH7770 ... CPU_SH7785:
+       case CPU_SH7770 ... CPU_SHX3:
                *p++ = '4';
                *p++ = 'a';
                break;
-       case CPU_SH73180 ... CPU_SH7722:
+       case CPU_SH7343 ... CPU_SH7722:
                *p++ = '4';
                *p++ = 'a';
                *p++ = 'l';
@@ -54,7 +54,7 @@ static void __init check_bugs(void)
                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' */