vserver 1.9.5.x5

[linux-2.6.git] / arch / m32r / kernel / setup.c

diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c
index db9589c..fb03be1 100644 (file)
--- a/arch/m32r/kernel/setup.c
+++ b/arch/m32r/kernel/setup.c
@@ -251,7 +251,9 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef CONFIG_DISCONTIGMEM
-       numnodes = 2;
+       nodes_clear(node_online_map);
+       node_set_online(0);
+       node_set_online(1);
 #endif /* CONFIG_DISCONTIGMEM */
 
        init_mm.start_code = (unsigned long) _text;
@@ -389,7 +391,7 @@ void __init cpu_init (void)
 
        /* Force FPU initialization */
        current_thread_info()->status = 0;
-       current->used_math = 0;
+       clear_used_math();
 
 #ifdef CONFIG_MMU
        /* Set up MMU */