Commit bce5aeb5 authored by Martin J. Bligh's avatar Martin J. Bligh Committed by Linus Torvalds

[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!
parent 98ae8e2b
...@@ -121,7 +121,7 @@ static int vidport; ...@@ -121,7 +121,7 @@ static int vidport;
static int lines, cols; static int lines, cols;
#ifdef CONFIG_MULTIQUAD #ifdef CONFIG_MULTIQUAD
static void * const xquad_portio = NULL; static void * xquad_portio = NULL;
#endif #endif
#include "../../../../lib/inflate.c" #include "../../../../lib/inflate.c"
......
...@@ -1060,11 +1060,11 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -1060,11 +1060,11 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
if (clustered_apic_mode && (numnodes > 1)) { if (clustered_apic_mode && (numnodes > 1)) {
printk("Remapping cross-quad port I/O for %d quads\n", printk("Remapping cross-quad port I/O for %d quads\n",
numnodes); numnodes);
xquad_portio = ioremap (XQUAD_PORTIO_BASE,
numnodes * XQUAD_PORTIO_QUAD);
printk("xquad_portio vaddr 0x%08lx, len %08lx\n", printk("xquad_portio vaddr 0x%08lx, len %08lx\n",
(u_long) xquad_portio, (u_long) xquad_portio,
(u_long) numnodes * XQUAD_PORTIO_LEN); (u_long) numnodes * XQUAD_PORTIO_QUAD);
xquad_portio = ioremap (XQUAD_PORTIO_BASE,
numnodes * XQUAD_PORTIO_LEN);
} }
/* /*
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#define XQUAD_PORTIO_BASE 0xfe400000 #define XQUAD_PORTIO_BASE 0xfe400000
#define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */
#define XQUAD_PORTIO_LEN 0x80000 /* Only remapping first 2 quads */
#ifdef __KERNEL__ #ifdef __KERNEL__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment