diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/sh/mm/uncached.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/sh/mm/uncached.c')
| -rw-r--r-- | arch/sh/mm/uncached.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/uncached.c b/arch/sh/mm/uncached.c index 8a4eca551fc0..a7767da815e9 100644 --- a/arch/sh/mm/uncached.c +++ b/arch/sh/mm/uncached.c | |||
| @@ -28,7 +28,7 @@ EXPORT_SYMBOL(virt_addr_uncached); | |||
| 28 | 28 | ||
| 29 | void __init uncached_init(void) | 29 | void __init uncached_init(void) |
| 30 | { | 30 | { |
| 31 | #ifdef CONFIG_29BIT | 31 | #if defined(CONFIG_29BIT) || !defined(CONFIG_MMU) |
| 32 | uncached_start = P2SEG; | 32 | uncached_start = P2SEG; |
| 33 | #else | 33 | #else |
| 34 | uncached_start = memory_end; | 34 | uncached_start = memory_end; |