From: Andrew Morton <akpm@osdl.org>
Cc: Christoph Lameter <christoph@lameter.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
mm/page_alloc.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff -puN mm/page_alloc.c~node-local-per-cpu-pages-tidy-2 mm/page_alloc.c
--- 25/mm/page_alloc.c~node-local-per-cpu-pages-tidy-2 2005-05-09 20:09:17.000000000 -0700
+++ 25-akpm/mm/page_alloc.c 2005-05-09 20:09:17.000000000 -0700
@@ -70,8 +70,10 @@ EXPORT_SYMBOL(nr_swap_pages);
*/
struct zone *zone_table[1 << ZONETABLE_SHIFT];
EXPORT_SYMBOL(zone_table);
+
#ifdef CONFIG_NUMA
-struct per_cpu_pageset pageset_table[MAX_NR_ZONES*MAX_NUMNODES*NR_CPUS] __initdata;
+static struct per_cpu_pageset
+ pageset_table[MAX_NR_ZONES*MAX_NUMNODES*NR_CPUS] __initdata;
#endif
static char *zone_names[MAX_NR_ZONES] = { "DMA", "Normal", "HighMem" };
@@ -1920,7 +1922,9 @@ static void __init free_area_init_core(s
for (cpu = 0; cpu < NR_CPUS; cpu++) {
struct per_cpu_pages *pcp;
#ifdef CONFIG_NUMA
- struct per_cpu_pageset *pgset = &pageset_table[nid*MAX_NR_ZONES*NR_CPUS + (j * NR_CPUS) + cpu];
+ struct per_cpu_pageset *pgset;
+ pgset = &pageset_table[nid*MAX_NR_ZONES*NR_CPUS +
+ (j * NR_CPUS) + cpu];
zone->pageset[cpu] = pgset;
#else
_