diff options
Diffstat (limited to 'arch/sh/mm/init.c')
-rw-r--r-- | arch/sh/mm/init.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 58012b6bbe76..08e280d7cc7e 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -26,21 +26,6 @@ | |||
26 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 26 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
27 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 27 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
28 | 28 | ||
29 | #ifdef CONFIG_UNCACHED_MAPPING | ||
30 | /* | ||
31 | * This is the offset of the uncached section from its cached alias. | ||
32 | * | ||
33 | * Legacy platforms handle trivial transitions between cached and | ||
34 | * uncached segments by making use of the 1:1 mapping relationship in | ||
35 | * 512MB lowmem, others via a special uncached mapping. | ||
36 | * | ||
37 | * Default value only valid in 29 bit mode, in 32bit mode this will be | ||
38 | * updated by the early PMB initialization code. | ||
39 | */ | ||
40 | unsigned long cached_to_uncached = 0x20000000; | ||
41 | unsigned long uncached_size = SZ_512M; | ||
42 | #endif | ||
43 | |||
44 | #ifdef CONFIG_MMU | 29 | #ifdef CONFIG_MMU |
45 | static pte_t *__get_pte_phys(unsigned long addr) | 30 | static pte_t *__get_pte_phys(unsigned long addr) |
46 | { | 31 | { |
@@ -260,7 +245,7 @@ void __init mem_init(void) | |||
260 | memset(empty_zero_page, 0, PAGE_SIZE); | 245 | memset(empty_zero_page, 0, PAGE_SIZE); |
261 | __flush_wback_region(empty_zero_page, PAGE_SIZE); | 246 | __flush_wback_region(empty_zero_page, PAGE_SIZE); |
262 | 247 | ||
263 | /* Initialize the vDSO */ | 248 | uncached_init(); |
264 | vsyscall_init(); | 249 | vsyscall_init(); |
265 | 250 | ||
266 | codesize = (unsigned long) &_etext - (unsigned long) &_text; | 251 | codesize = (unsigned long) &_etext - (unsigned long) &_text; |
@@ -303,9 +288,7 @@ void __init mem_init(void) | |||
303 | ((unsigned long)high_memory - (unsigned long)memory_start) >> 20, | 288 | ((unsigned long)high_memory - (unsigned long)memory_start) >> 20, |
304 | 289 | ||
305 | #ifdef CONFIG_UNCACHED_MAPPING | 290 | #ifdef CONFIG_UNCACHED_MAPPING |
306 | (unsigned long)memory_start + cached_to_uncached, | 291 | uncached_start, uncached_end, uncached_size >> 20, |
307 | (unsigned long)memory_start + cached_to_uncached + uncached_size, | ||
308 | uncached_size >> 20, | ||
309 | #endif | 292 | #endif |
310 | 293 | ||
311 | (unsigned long)&__init_begin, (unsigned long)&__init_end, | 294 | (unsigned long)&__init_begin, (unsigned long)&__init_end, |