Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / sh / kernel / cpu / init.c

diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 975103f..868e68b 100644 (file)
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -24,13 +24,13 @@ extern void detect_cpu_and_cache_system(void);
  * Generic wrapper for command line arguments to disable on-chip
  * peripherals (nofpu, nodsp, and so forth).
  */
-#define onchip_setup(x)                        \
-static int x##_disabled __initdata = 0;        \
+#define onchip_setup(x)                                \
+static int x##_disabled __initdata = 0;                \
                                                \
 static int __init x##_setup(char *opts)                \
 {                                              \
        x##_disabled = 1;                       \
-       return 0;                               \
+       return 1;                               \
 }                                              \
 __setup("no" __stringify(x), x##_setup);
 
@@ -88,7 +88,7 @@ static void __init cache_init(void)
                } while (--ways);
        }
 
-       /* 
+       /*
         * Default CCR values .. enable the caches
         * and invalidate them immediately..
         */
@@ -160,7 +160,7 @@ static void __init dsp_init(void)
 }
 #endif /* CONFIG_SH_DSP */
 
-/*
+/**
  * sh_cpu_init
  *
  * This is our initial entry point for each CPU, and is invoked on the boot
@@ -194,13 +194,13 @@ asmlinkage void __init sh_cpu_init(void)
        /* FPU initialization */
        if ((cpu_data->flags & CPU_HAS_FPU)) {
                clear_thread_flag(TIF_USEDFPU);
-               current->used_math = 0;
+               clear_used_math();
        }
 
 #ifdef CONFIG_SH_DSP
        /* Probe for DSP */
        dsp_init();
-       
+
        /* Disable the DSP */
        if (dsp_disabled) {
                printk("DSP Disabled\n");