diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-08 19:56:37 -0500 |
commit | 04cf399640b7acfa9abe2eb7900cd934db8af697 (patch) | |
tree | f9a055f2f0170550f5f0b0507b06ffce8d98945d /arch/powerpc/mm/init_32.c | |
parent | 17f0056e6a2f3d1818801705f5e12b71217bf4ef (diff) | |
parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/powerpc/mm/init_32.c')
-rw-r--r-- | arch/powerpc/mm/init_32.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c index 161cefde5c15..6157be2a7049 100644 --- a/arch/powerpc/mm/init_32.c +++ b/arch/powerpc/mm/init_32.c | |||
@@ -65,6 +65,13 @@ phys_addr_t memstart_addr = (phys_addr_t)~0ull; | |||
65 | EXPORT_SYMBOL(memstart_addr); | 65 | EXPORT_SYMBOL(memstart_addr); |
66 | phys_addr_t kernstart_addr; | 66 | phys_addr_t kernstart_addr; |
67 | EXPORT_SYMBOL(kernstart_addr); | 67 | EXPORT_SYMBOL(kernstart_addr); |
68 | |||
69 | #ifdef CONFIG_RELOCATABLE_PPC32 | ||
70 | /* Used in __va()/__pa() */ | ||
71 | long long virt_phys_offset; | ||
72 | EXPORT_SYMBOL(virt_phys_offset); | ||
73 | #endif | ||
74 | |||
68 | phys_addr_t lowmem_end_addr; | 75 | phys_addr_t lowmem_end_addr; |
69 | 76 | ||
70 | int boot_mapsize; | 77 | int boot_mapsize; |
@@ -134,8 +141,7 @@ void __init MMU_init(void) | |||
134 | 141 | ||
135 | if (memblock.memory.cnt > 1) { | 142 | if (memblock.memory.cnt > 1) { |
136 | #ifndef CONFIG_WII | 143 | #ifndef CONFIG_WII |
137 | memblock.memory.cnt = 1; | 144 | memblock_enforce_memory_limit(memblock.memory.regions[0].size); |
138 | memblock_analyze(); | ||
139 | printk(KERN_WARNING "Only using first contiguous memory region"); | 145 | printk(KERN_WARNING "Only using first contiguous memory region"); |
140 | #else | 146 | #else |
141 | wii_memory_fixups(); | 147 | wii_memory_fixups(); |
@@ -158,7 +164,6 @@ void __init MMU_init(void) | |||
158 | #ifndef CONFIG_HIGHMEM | 164 | #ifndef CONFIG_HIGHMEM |
159 | total_memory = total_lowmem; | 165 | total_memory = total_lowmem; |
160 | memblock_enforce_memory_limit(total_lowmem); | 166 | memblock_enforce_memory_limit(total_lowmem); |
161 | memblock_analyze(); | ||
162 | #endif /* CONFIG_HIGHMEM */ | 167 | #endif /* CONFIG_HIGHMEM */ |
163 | } | 168 | } |
164 | 169 | ||