2 files changed, 5 insertions, 6 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 @@
 #define FIXADDR_TOP             0xfffe0000UL
 #define FIXADDR_SIZE            (FIXADDR_TOP - FIXADDR_START)
 
-#define FIX_KMAP_BEGIN          0
-#define FIX_KMAP_END            (FIXADDR_SIZE >> PAGE_SHIFT)
+#define FIX_KMAP_NR_PTES        (FIXADDR_SIZE >> PAGE_SHIFT)
 
 #define __fix_to_virt(x)        (FIXADDR_START + ((x) << PAGE_SHIFT))
 #define __virt_to_fix(x)        (((x) - FIXADDR_START) >> PAGE_SHIFT)
@@ -27,7 +26,7 @@ extern void __this_fixmap_does_not_exist(void);
 
 static inline unsigned long fix_to_virt(const unsigned int idx)
 {
-        if (idx >= FIX_KMAP_END)
+        if (idx >= FIX_KMAP_NR_PTES)
                 __this_fixmap_does_not_exist();
         return __fix_to_virt(idx);
 }
diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
index 21b9e1bf9b77..e05e8ad26ba5 100644
--- a/arch/arm/mm/highmem.c
+++ b/arch/arm/mm/highmem.c
@@ -63,7 +63,7 @@ void *kmap_atomic(struct page *page)
         type = kmap_atomic_idx_push();
 
         idx = type + KM_TYPE_NR * smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+        vaddr = __fix_to_virt(idx);
 #ifdef CONFIG_DEBUG_HIGHMEM
         /*
          * With debugging enabled, kunmap_atomic forces that entry to 0.
@@ -94,7 +94,7 @@ void __kunmap_atomic(void *kvaddr)
                 if (cache_is_vivt())
                         __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
 #ifdef CONFIG_DEBUG_HIGHMEM
-                BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx));
+                BUG_ON(vaddr != __fix_to_virt(idx));
                 set_top_pte(vaddr, __pte(0));
 #else
                 (void) idx;  /* to kill a warning */
@@ -117,7 +117,7 @@ void *kmap_atomic_pfn(unsigned long pfn)
 
         type = kmap_atomic_idx_push();
         idx = type + KM_TYPE_NR * smp_processor_id();
-        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+        vaddr = __fix_to_virt(idx);
 #ifdef CONFIG_DEBUG_HIGHMEM
         BUG_ON(!pte_none(get_top_pte(vaddr)));
 #endif