Merge commit 'upstream/master'

[pandora-kernel.git] / arch / mips / sgi-ip27 / ip27-klnuma.c

diff --git a/arch/mips/sgi-ip27/ip27-klnuma.c b/arch/mips/sgi-ip27/ip27-klnuma.c
index f9f404a..d9c79d8 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-klnuma.c
+++ b/arch/mips/sgi-ip27/ip27-klnuma.c
@@ -4,6 +4,7 @@
  * Copyright 2000 - 2001 Kanoj Sarcar (kanoj@sgi.com)
  */
 #include <linux/init.h>
+#include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/kernel.h>
 #include <linux/nodemask.h>
@@ -11,7 +12,6 @@
 
 #include <asm/page.h>
 #include <asm/sections.h>
-#include <asm/smp.h>
 #include <asm/sn/types.h>
 #include <asm/sn/arch.h>
 #include <asm/sn/gda.h>
@@ -28,8 +28,6 @@ static cpumask_t ktext_repmask;
  */
 void __init setup_replication_mask(void)
 {
-       cnodeid_t       cnode;
-
        /* Set only the master cnode's bit.  The master cnode is always 0. */
        cpus_clear(ktext_repmask);
        cpu_set(0, ktext_repmask);
@@ -38,11 +36,15 @@ void __init setup_replication_mask(void)
 #ifndef CONFIG_MAPPED_KERNEL
 #error Kernel replication works with mapped kernel support. No calias support.
 #endif
-       for_each_online_node(cnode) {
-               if (cnode == 0)
-                       continue;
-               /* Advertise that we have a copy of the kernel */
-               cpu_set(cnode, ktext_repmask);
+       {
+               cnodeid_t       cnode;
+
+               for_each_online_node(cnode) {
+                       if (cnode == 0)
+                               continue;
+                       /* Advertise that we have a copy of the kernel */
+                       cpu_set(cnode, ktext_repmask);
+               }
        }
 #endif
        /* Set up a GDA pointer to the replication mask. */