diff options
author | Magnus Damm <damm@opensource.se> | 2009-12-07 09:16:07 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-08 22:40:44 -0500 |
commit | b25b9758466bb8bc837f1863389015820f7cb11d (patch) | |
tree | 549c24844b74c4237b9e37a0e117da6f82476097 /arch/sh | |
parent | f3a4c00ad35a9f21db82516fdc600cb1be301c23 (diff) |
sh: NUMA lmb fixes
This patch updates the NUMA version of setup_memory()
with UMA code changes and also modifies the last argument
to lmb_alloc_base() to use an address instead of pfn.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/mm/numa.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/sh/mm/numa.c b/arch/sh/mm/numa.c index b44e83526673..422e92721878 100644 --- a/arch/sh/mm/numa.c +++ b/arch/sh/mm/numa.c | |||
@@ -38,6 +38,15 @@ void __init setup_memory(void) | |||
38 | (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET)); | 38 | (__MEMORY_START + CONFIG_ZERO_PAGE_OFFSET)); |
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Reserve physical pages below CONFIG_ZERO_PAGE_OFFSET. | ||
42 | */ | ||
43 | if (CONFIG_ZERO_PAGE_OFFSET != 0) | ||
44 | lmb_reserve(__MEMORY_START, CONFIG_ZERO_PAGE_OFFSET); | ||
45 | |||
46 | lmb_analyze(); | ||
47 | lmb_dump_all(); | ||
48 | |||
49 | /* | ||
41 | * Node 0 sets up its pgdat at the first available pfn, | 50 | * Node 0 sets up its pgdat at the first available pfn, |
42 | * and bumps it up before setting up the bootmem allocator. | 51 | * and bumps it up before setting up the bootmem allocator. |
43 | */ | 52 | */ |
@@ -71,7 +80,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) | |||
71 | 80 | ||
72 | /* Node-local pgdat */ | 81 | /* Node-local pgdat */ |
73 | NODE_DATA(nid) = __va(lmb_alloc_base(sizeof(struct pglist_data), | 82 | NODE_DATA(nid) = __va(lmb_alloc_base(sizeof(struct pglist_data), |
74 | SMP_CACHE_BYTES, end_pfn)); | 83 | SMP_CACHE_BYTES, end)); |
75 | memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); | 84 | memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); |
76 | 85 | ||
77 | NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; | 86 | NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; |
@@ -81,7 +90,7 @@ void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end) | |||
81 | /* Node-local bootmap */ | 90 | /* Node-local bootmap */ |
82 | bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn); | 91 | bootmap_pages = bootmem_bootmap_pages(end_pfn - start_pfn); |
83 | bootmem_paddr = lmb_alloc_base(bootmap_pages << PAGE_SHIFT, | 92 | bootmem_paddr = lmb_alloc_base(bootmap_pages << PAGE_SHIFT, |
84 | PAGE_SIZE, end_pfn); | 93 | PAGE_SIZE, end); |
85 | init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT, | 94 | init_bootmem_node(NODE_DATA(nid), bootmem_paddr >> PAGE_SHIFT, |
86 | start_pfn, end_pfn); | 95 | start_pfn, end_pfn); |
87 | 96 | ||