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>

1 files changed, 3 insertions, 3 deletions

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