diff options
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 6f55efd9be95..e2c95fcb8055 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -46,9 +46,7 @@ | |||
46 | #include <asm/prom.h> | 46 | #include <asm/prom.h> |
47 | #include <asm/lmb.h> | 47 | #include <asm/lmb.h> |
48 | #include <asm/sections.h> | 48 | #include <asm/sections.h> |
49 | #ifdef CONFIG_PPC64 | ||
50 | #include <asm/vdso.h> | 49 | #include <asm/vdso.h> |
51 | #endif | ||
52 | 50 | ||
53 | #include "mmu_decl.h" | 51 | #include "mmu_decl.h" |
54 | 52 | ||
@@ -110,6 +108,7 @@ EXPORT_SYMBOL(phys_mem_access_prot); | |||
110 | void online_page(struct page *page) | 108 | void online_page(struct page *page) |
111 | { | 109 | { |
112 | ClearPageReserved(page); | 110 | ClearPageReserved(page); |
111 | set_page_count(page, 0); | ||
113 | free_cold_page(page); | 112 | free_cold_page(page); |
114 | totalram_pages++; | 113 | totalram_pages++; |
115 | num_physpages++; | 114 | num_physpages++; |
@@ -127,6 +126,9 @@ int __devinit add_memory(u64 start, u64 size) | |||
127 | unsigned long start_pfn = start >> PAGE_SHIFT; | 126 | unsigned long start_pfn = start >> PAGE_SHIFT; |
128 | unsigned long nr_pages = size >> PAGE_SHIFT; | 127 | unsigned long nr_pages = size >> PAGE_SHIFT; |
129 | 128 | ||
129 | start += KERNELBASE; | ||
130 | create_section_mapping(start, start + size); | ||
131 | |||
130 | /* this should work for most non-highmem platforms */ | 132 | /* this should work for most non-highmem platforms */ |
131 | zone = pgdata->node_zones; | 133 | zone = pgdata->node_zones; |
132 | 134 | ||
@@ -393,10 +395,8 @@ void __init mem_init(void) | |||
393 | 395 | ||
394 | mem_init_done = 1; | 396 | mem_init_done = 1; |
395 | 397 | ||
396 | #ifdef CONFIG_PPC64 | ||
397 | /* Initialize the vDSO */ | 398 | /* Initialize the vDSO */ |
398 | vdso_init(); | 399 | vdso_init(); |
399 | #endif | ||
400 | } | 400 | } |
401 | 401 | ||
402 | /* | 402 | /* |