diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-21 02:05:25 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-21 02:05:25 -0500 |
commit | 2dc2f8e0c46864e2a3722c84eaa96513d4cf8b2f (patch) | |
tree | 8464625ad2cf3f5a7e567d37493a15ec3596a98b /arch/sh/include/asm/fixmap.h | |
parent | 3125ee72dca25fc2157dcddd07e2d740db921fc4 (diff) |
sh: Kill off the special uncached section and fixmap.
Now that cached_to_uncached works as advertized in 32-bit mode and we're
never going to be able to map < 16MB anyways, there's no need for the
special uncached section. Kill it off.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/fixmap.h')
-rw-r--r-- | arch/sh/include/asm/fixmap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h index 38a1de866873..17b22b6c1001 100644 --- a/arch/sh/include/asm/fixmap.h +++ b/arch/sh/include/asm/fixmap.h | |||
@@ -55,11 +55,12 @@ enum fixed_addresses { | |||
55 | #define FIX_N_COLOURS 8 | 55 | #define FIX_N_COLOURS 8 |
56 | FIX_CMAP_BEGIN, | 56 | FIX_CMAP_BEGIN, |
57 | FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1, | 57 | FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS) - 1, |
58 | FIX_UNCACHED, | 58 | |
59 | #ifdef CONFIG_HIGHMEM | 59 | #ifdef CONFIG_HIGHMEM |
60 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ | 60 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ |
61 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | 61 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, |
62 | #endif | 62 | #endif |
63 | |||
63 | /* | 64 | /* |
64 | * FIX_IOREMAP entries are useful for mapping physical address | 65 | * FIX_IOREMAP entries are useful for mapping physical address |
65 | * space before ioremap() is useable, e.g. really early in boot | 66 | * space before ioremap() is useable, e.g. really early in boot |
@@ -68,6 +69,7 @@ enum fixed_addresses { | |||
68 | #define FIX_N_IOREMAPS 32 | 69 | #define FIX_N_IOREMAPS 32 |
69 | FIX_IOREMAP_BEGIN, | 70 | FIX_IOREMAP_BEGIN, |
70 | FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS, | 71 | FIX_IOREMAP_END = FIX_IOREMAP_BEGIN + FIX_N_IOREMAPS, |
72 | |||
71 | __end_of_fixed_addresses | 73 | __end_of_fixed_addresses |
72 | }; | 74 | }; |
73 | 75 | ||