diff options
author | Johannes Weiner <hannes@saeurebad.de> | 2008-07-24 00:28:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:20 -0400 |
commit | 3560e249abda6bee41a07a7bf0383a6e193e2839 (patch) | |
tree | a5770b74f13dca64e34cd5a1e3182e4e1f98a9ca /arch/m32r/mm | |
parent | 75a56cfe9fdb064d1db1cfbc564315fddb756fb1 (diff) |
bootmem: replace node_boot_start in struct bootmem_data
Almost all users of this field need a PFN instead of a physical address,
so replace node_boot_start with node_min_pfn.
[Lee.Schermerhorn@hp.com: fix spurious BUG_ON() in mark_bootmem()]
Signed-off-by: Johannes Weiner <hannes@saeureba.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m32r/mm')
-rw-r--r-- | arch/m32r/mm/discontig.c | 3 | ||||
-rw-r--r-- | arch/m32r/mm/init.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index cc23934bc41e..cbc3c4c54566 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c | |||
@@ -123,8 +123,7 @@ unsigned long __init setup_memory(void) | |||
123 | return max_low_pfn; | 123 | return max_low_pfn; |
124 | } | 124 | } |
125 | 125 | ||
126 | #define START_PFN(nid) \ | 126 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) |
127 | (NODE_DATA(nid)->bdata->node_boot_start >> PAGE_SHIFT) | ||
128 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) | 127 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) |
129 | 128 | ||
130 | unsigned long __init zone_sizes_init(void) | 129 | unsigned long __init zone_sizes_init(void) |
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 28799af15e95..2554eb59cfef 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
@@ -93,8 +93,7 @@ void free_initrd_mem(unsigned long, unsigned long); | |||
93 | #endif | 93 | #endif |
94 | 94 | ||
95 | /* It'd be good if these lines were in the standard header file. */ | 95 | /* It'd be good if these lines were in the standard header file. */ |
96 | #define START_PFN(nid) \ | 96 | #define START_PFN(nid) (NODE_DATA(nid)->bdata->node_min_pfn) |
97 | (NODE_DATA(nid)->bdata->node_boot_start >> PAGE_SHIFT) | ||
98 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) | 97 | #define MAX_LOW_PFN(nid) (NODE_DATA(nid)->bdata->node_low_pfn) |
99 | 98 | ||
100 | #ifndef CONFIG_DISCONTIGMEM | 99 | #ifndef CONFIG_DISCONTIGMEM |
@@ -252,4 +251,3 @@ void free_initrd_mem(unsigned long start, unsigned long end) | |||
252 | printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); | 251 | printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); |
253 | } | 252 | } |
254 | #endif | 253 | #endif |
255 | |||