diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:37:51 -0500 |
| commit | 3ae0af12b458461f36dfddb26e54056be32928dd (patch) | |
| tree | 063059f24f42506ce2a86374a3b6e2b7a8ae3fcf /arch/powerpc/mm/mem.c | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
| parent | 7c43ee40ec602db3fa27e6e2d4f092f06ab0901c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 6f55efd9be95..1dd3cc69a490 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
| @@ -110,6 +110,7 @@ EXPORT_SYMBOL(phys_mem_access_prot); | |||
| 110 | void online_page(struct page *page) | 110 | void online_page(struct page *page) |
| 111 | { | 111 | { |
| 112 | ClearPageReserved(page); | 112 | ClearPageReserved(page); |
| 113 | set_page_count(page, 0); | ||
| 113 | free_cold_page(page); | 114 | free_cold_page(page); |
| 114 | totalram_pages++; | 115 | totalram_pages++; |
| 115 | num_physpages++; | 116 | num_physpages++; |
| @@ -127,6 +128,9 @@ int __devinit add_memory(u64 start, u64 size) | |||
| 127 | unsigned long start_pfn = start >> PAGE_SHIFT; | 128 | unsigned long start_pfn = start >> PAGE_SHIFT; |
| 128 | unsigned long nr_pages = size >> PAGE_SHIFT; | 129 | unsigned long nr_pages = size >> PAGE_SHIFT; |
| 129 | 130 | ||
| 131 | start += KERNELBASE; | ||
| 132 | create_section_mapping(start, start + size); | ||
| 133 | |||
| 130 | /* this should work for most non-highmem platforms */ | 134 | /* this should work for most non-highmem platforms */ |
| 131 | zone = pgdata->node_zones; | 135 | zone = pgdata->node_zones; |
| 132 | 136 | ||
