diff options
Diffstat (limited to 'arch/arm/mm/highmem.c')
| -rw-r--r-- | arch/arm/mm/highmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c index ee8dfa793989..9df5f09585ca 100644 --- a/arch/arm/mm/highmem.c +++ b/arch/arm/mm/highmem.c | |||
| @@ -79,7 +79,7 @@ void *kmap_atomic(struct page *page) | |||
| 79 | 79 | ||
| 80 | type = kmap_atomic_idx_push(); | 80 | type = kmap_atomic_idx_push(); |
| 81 | 81 | ||
| 82 | idx = type + KM_TYPE_NR * smp_processor_id(); | 82 | idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id(); |
| 83 | vaddr = __fix_to_virt(idx); | 83 | vaddr = __fix_to_virt(idx); |
| 84 | #ifdef CONFIG_DEBUG_HIGHMEM | 84 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 85 | /* | 85 | /* |
| @@ -106,7 +106,7 @@ void __kunmap_atomic(void *kvaddr) | |||
| 106 | 106 | ||
| 107 | if (kvaddr >= (void *)FIXADDR_START) { | 107 | if (kvaddr >= (void *)FIXADDR_START) { |
| 108 | type = kmap_atomic_idx(); | 108 | type = kmap_atomic_idx(); |
| 109 | idx = type + KM_TYPE_NR * smp_processor_id(); | 109 | idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id(); |
| 110 | 110 | ||
| 111 | if (cache_is_vivt()) | 111 | if (cache_is_vivt()) |
| 112 | __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE); | 112 | __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE); |
| @@ -138,7 +138,7 @@ void *kmap_atomic_pfn(unsigned long pfn) | |||
| 138 | return page_address(page); | 138 | return page_address(page); |
| 139 | 139 | ||
| 140 | type = kmap_atomic_idx_push(); | 140 | type = kmap_atomic_idx_push(); |
| 141 | idx = type + KM_TYPE_NR * smp_processor_id(); | 141 | idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id(); |
| 142 | vaddr = __fix_to_virt(idx); | 142 | vaddr = __fix_to_virt(idx); |
| 143 | #ifdef CONFIG_DEBUG_HIGHMEM | 143 | #ifdef CONFIG_DEBUG_HIGHMEM |
| 144 | BUG_ON(!pte_none(get_fixmap_pte(vaddr))); | 144 | BUG_ON(!pte_none(get_fixmap_pte(vaddr))); |