Merge branch 'upstream' into irq-pio

1 files changed, 4 insertions, 1 deletions

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index dcbfd27071f0..bcf1b10e518f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -529,7 +529,10 @@ void __init setup_arch(char **cmdline_p)
 
 int __init fpu_disable(char *s)
 {
-        cpu_data[0].options &= ~MIPS_CPU_FPU;
+        int i;
+
+        for (i = 0; i < NR_CPUS; i++)
+                cpu_data[i].options &= ~MIPS_CPU_FPU;
 
         return 1;
 }