diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-08 07:03:21 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-08 07:03:21 -0500 |
commit | 40d1f0048289b1baed859baee06878417fae540e (patch) | |
tree | 77ff254a151fbc9300d6c25ccbdc8949be9061c1 /arch/sh/mm/uncached.c | |
parent | a8941dad1f12b4e8a87a517ed27f29d0209c817c (diff) |
sh: Fix up uncached offset for legacy 29-bit mode.
The uncached_start was being set up properly for 32-bit but managed to
break 29-bit in the process, fix it up.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/uncached.c')
-rw-r--r-- | arch/sh/mm/uncached.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/mm/uncached.c b/arch/sh/mm/uncached.c index cf20a5c5136a..2ef57efeb225 100644 --- a/arch/sh/mm/uncached.c +++ b/arch/sh/mm/uncached.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #include <linux/init.h> | 1 | #include <linux/init.h> |
2 | #include <asm/sizes.h> | 2 | #include <asm/sizes.h> |
3 | #include <asm/page.h> | 3 | #include <asm/page.h> |
4 | #include <asm/addrspace.h> | ||
4 | 5 | ||
5 | /* | 6 | /* |
6 | * This is the offset of the uncached section from its cached alias. | 7 | * This is the offset of the uncached section from its cached alias. |
@@ -23,7 +24,11 @@ int virt_addr_uncached(unsigned long kaddr) | |||
23 | 24 | ||
24 | void __init uncached_init(void) | 25 | void __init uncached_init(void) |
25 | { | 26 | { |
27 | #ifdef CONFIG_29BIT | ||
28 | uncached_start = P2SEG; | ||
29 | #else | ||
26 | uncached_start = memory_end; | 30 | uncached_start = memory_end; |
31 | #endif | ||
27 | uncached_end = uncached_start + uncached_size; | 32 | uncached_end = uncached_start + uncached_size; |
28 | } | 33 | } |
29 | 34 | ||