aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorLiu Hua <sdu.liu@huawei.com>2014-04-18 04:27:01 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-04-23 06:09:27 -0400
commit4221e2e6b3160e4b558df14fa79f025c0e277935 (patch)
tree35a6bed487f7ab9ddaa557eb9f447bbaec8824ca /arch/arm/include/asm
parent16c79a3776c17965dedab4732d925f6098df91c1 (diff)
ARM: 8031/1: fixmap: remove FIX_KMAP_BEGIN and FIX_KMAP_END
It seems that these two macros are not used by non architecture specific code. And on ARM FIX_KMAP_BEGIN equals zero. This patch removes these two macros. Instead, using FIX_KMAP_NR_PTES to tell the pte number belonged to fixmap mapping region. The code will become clearer when I introduce a bugfix on fixmap mapping region. Reviewed-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Liu Hua <sdu.liu@huawei.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/fixmap.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
index bbae919bceb4..be55ebc08ed4 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -17,8 +17,7 @@
17#define FIXADDR_TOP 0xfffe0000UL 17#define FIXADDR_TOP 0xfffe0000UL
18#define FIXADDR_SIZE (FIXADDR_TOP - FIXADDR_START) 18#define FIXADDR_SIZE (FIXADDR_TOP - FIXADDR_START)
19 19
20#define FIX_KMAP_BEGIN 0 20#define FIX_KMAP_NR_PTES (FIXADDR_SIZE >> PAGE_SHIFT)
21#define FIX_KMAP_END (FIXADDR_SIZE >> PAGE_SHIFT)
22 21
23#define __fix_to_virt(x) (FIXADDR_START + ((x) << PAGE_SHIFT)) 22#define __fix_to_virt(x) (FIXADDR_START + ((x) << PAGE_SHIFT))
24#define __virt_to_fix(x) (((x) - FIXADDR_START) >> PAGE_SHIFT) 23#define __virt_to_fix(x) (((x) - FIXADDR_START) >> PAGE_SHIFT)
@@ -27,7 +26,7 @@ extern void __this_fixmap_does_not_exist(void);
27 26
28static inline unsigned long fix_to_virt(const unsigned int idx) 27static inline unsigned long fix_to_virt(const unsigned int idx)
29{ 28{
30 if (idx >= FIX_KMAP_END) 29 if (idx >= FIX_KMAP_NR_PTES)
31 __this_fixmap_does_not_exist(); 30 __this_fixmap_does_not_exist();
32 return __fix_to_virt(idx); 31 return __fix_to_virt(idx);
33} 32}