2002-09-21 21:28:41

by Martin J. Bligh

[permalink] [raw]
Subject: free_area_init_node fix (for non discontigmem direct use)

Some idiot (OK, it was me) broke free_area_init_node for
non discontigmem systems that call it directly (eg sparc64),
during a recent cleanup, thus invoking the wrath of DaveM.

I know Dave sent you a patch yesterday, but I think the BUG
statement in it will break anyone who just uses free_area_init
(eg any PC). So here's a portion of Dave's patch that should
fix things for everyone I think. Unfortunately my non-NUMA
test box is borked right now, but it just removes the BUG
statement from what he tested, and it's so simple that even
I couldn't screw this up (famous last words).

This code really needs some more cleanup work, but this will
fix it for now so everyone can do their work ...

Please apply,


diff -urN -X /home/mbligh/.diff.exclude virgin/mm/numa.c fain/mm/numa.c
--- virgin/mm/numa.c Fri Sep 20 08:20:34 2002
+++ fain/mm/numa.c Sat Sep 21 13:20:50 2002
@@ -27,6 +27,7 @@
unsigned long size;

+ pgdat = &contig_page_data;
contig_page_data.node_id = 0;
contig_page_data.node_start_pfn = node_start_pfn;
calculate_totalpages (&contig_page_data, zones_size, zholes_size);