[PATCH] NUMA-Q fixes

 - Remove the const that someone incorrectly stuck in there, it type conflicts.
   Alan has a better plan for fixing this long term, but this fixes the compile
   warning for now.

 - Move the printk of the xquad_portio setup *after* we put something in the variable
   so it actually prints something useful, not 0 ;-)

 - To derive the size of the xquad_portio area, multiply the number of nodes by the
   size of each nodes, not the size of two nodes (and remove define). Doh!

diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c
index 42ce2febe8b7fc721be6709592954d40f5f3b206..fcec73a7e379681429b48f3c1f15f07bfd74b7bf 100644 (file)
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/i386/boot/compressed/misc.c
@@ -121,7 +121,7 @@ static int vidport;
 static int lines, cols;
 
 #ifdef CONFIG_MULTIQUAD
-static void * const xquad_portio = NULL;
+static void * xquad_portio = NULL;
 #endif
 
 #include "../../../../lib/inflate.c"

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 8a04f3d2c8aa93ec889341b1231f187fa63b20e0..9d513dc1ceb201e9f98e2ec4a35ccdab93f4509b 100644 (file)
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1060,11 +1060,11 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
         if (clustered_apic_mode && (numnodes > 1)) {
                 printk("Remapping cross-quad port I/O for %d quads\n",
                        numnodes);
+                xquad_portio = ioremap (XQUAD_PORTIO_BASE, 
+                       numnodes * XQUAD_PORTIO_QUAD);
                 printk("xquad_portio vaddr 0x%08lx, len %08lx\n",
                         (u_long) xquad_portio, 
-                       (u_long) numnodes * XQUAD_PORTIO_LEN);
-                xquad_portio = ioremap (XQUAD_PORTIO_BASE, 
-                       numnodes * XQUAD_PORTIO_LEN);
+                       (u_long) numnodes * XQUAD_PORTIO_QUAD);
         }
 
        /*

diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index b2afa09c062f06f21d39c32ba9275045c06b2e93..41bc8ef0bdf88dda4a77258d6f92d59c9c3f1353 100644 (file)
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -40,7 +40,6 @@
 
 #define XQUAD_PORTIO_BASE 0xfe400000
 #define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */
-#define XQUAD_PORTIO_LEN  0x80000  /* Only remapping first 2 quads */
 
 #ifdef __KERNEL__