diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-10 21:36:53 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-10 21:36:53 +0900 |
| commit | 5e3679c594e3a9bf819347bc59f70e03f2c6b272 (patch) | |
| tree | 1ff3d6e98446da565931e686643cd2c4ace7dabe /arch/sh/include | |
| parent | a469f627c15de2af392be23508e6094d7268e2b7 (diff) | |
| parent | f9e2bdfdbb4c9da13422b349227be8c7b41dbd44 (diff) | |
Merge branch 'sh/cachetlb'
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/fixmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/fixmap.h b/arch/sh/include/asm/fixmap.h index 721fcc4d5e98..76c5a3099cb8 100644 --- a/arch/sh/include/asm/fixmap.h +++ b/arch/sh/include/asm/fixmap.h @@ -14,9 +14,9 @@ #define _ASM_FIXMAP_H #include <linux/kernel.h> +#include <linux/threads.h> #include <asm/page.h> #ifdef CONFIG_HIGHMEM -#include <linux/threads.h> #include <asm/kmap_types.h> #endif @@ -46,9 +46,9 @@ * fix-mapped? */ enum fixed_addresses { -#define FIX_N_COLOURS 16 +#define FIX_N_COLOURS 8 FIX_CMAP_BEGIN, - FIX_CMAP_END = FIX_CMAP_BEGIN + FIX_N_COLOURS, + FIX_CMAP_END = FIX_CMAP_BEGIN + (FIX_N_COLOURS * NR_CPUS), FIX_UNCACHED, #ifdef CONFIG_HIGHMEM FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ |