11 files changed, 33 insertions, 189 deletions

diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
index e51b1e81df05..83eb2f772911 100644
--- a/arch/arm/include/asm/kmap_types.h
+++ b/arch/arm/include/asm/kmap_types.h
@@ -4,30 +4,6 @@
 /*
  * This is the "bare minimum".  AIO seems to require this.
  */
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_L1_CACHE,
-        KM_L2_CACHE,
-        KM_KDB,
-        KM_TYPE_NR
-};
-
-#ifdef CONFIG_DEBUG_HIGHMEM
-#define KM_NMI          (-1)
-#define KM_NMI_PTE      (-1)
-#define KM_IRQ_PTE      (-1)
-#endif
+#define KM_TYPE_NR 16
 
 #endif
diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
index b7f5c6870107..479330b89796 100644
--- a/arch/avr32/include/asm/kmap_types.h
+++ b/arch/avr32/include/asm/kmap_types.h
@@ -2,29 +2,9 @@
 #define __ASM_AVR32_KMAP_TYPES_H
 
 #ifdef CONFIG_DEBUG_HIGHMEM
-# define D(n) __KM_FENCE_##n ,
+# define KM_TYPE_NR 29
 #else
-# define D(n)
+# define KM_TYPE_NR 14
 #endif
 
-enum km_type {
-D(0)    KM_BOUNCE_READ,
-D(1)    KM_SKB_SUNRPC_DATA,
-D(2)    KM_SKB_DATA_SOFTIRQ,
-D(3)    KM_USER0,
-D(4)    KM_USER1,
-D(5)    KM_BIO_SRC_IRQ,
-D(6)    KM_BIO_DST_IRQ,
-D(7)    KM_PTE0,
-D(8)    KM_PTE1,
-D(9)    KM_PTE2,
-D(10)   KM_IRQ0,
-D(11)   KM_IRQ1,
-D(12)   KM_SOFTIRQ0,
-D(13)   KM_SOFTIRQ1,
-D(14)   KM_TYPE_NR
-};
-
-#undef D
-
 #endif /* __ASM_AVR32_KMAP_TYPES_H */
diff --git a/arch/frv/include/asm/highmem.h b/arch/frv/include/asm/highmem.h
index 716956a5317b..b3adc93611f3 100644
--- a/arch/frv/include/asm/highmem.h
+++ b/arch/frv/include/asm/highmem.h
@@ -76,15 +76,16 @@ extern struct page *kmap_atomic_to_page(void *ptr);
 
 #ifndef __ASSEMBLY__
 
-#define __kmap_atomic_primary(type, paddr, ampr)                                                \
+#define __kmap_atomic_primary(cached, paddr, ampr)                                              \
 ({                                                                                              \
         unsigned long damlr, dampr;                                                             \
                                                                                                 \
         dampr = paddr | xAMPRx_L | xAMPRx_M | xAMPRx_S | xAMPRx_SS_16Kb | xAMPRx_V;             \
                                                                                                 \
-        if (type != __KM_CACHE)                                                                 \
+        if (!cached)                                                                            \
                 asm volatile("movgs %0,dampr"#ampr :: "r"(dampr) : "memory");                   \
         else                                                                                    \
+                /* cache flush page attachment point */                                         \
                 asm volatile("movgs %0,iampr"#ampr"\n"                                          \
                              "movgs %0,dampr"#ampr"\n"                                          \
                              :: "r"(dampr) : "memory"                                           \
@@ -112,29 +113,20 @@ extern struct page *kmap_atomic_to_page(void *ptr);
         (void *) damlr;                                                                           \
 })
 
-static inline void *kmap_atomic_primary(struct page *page, enum km_type type)
+static inline void *kmap_atomic_primary(struct page *page)
 {
         unsigned long paddr;
 
         pagefault_disable();
         paddr = page_to_phys(page);
 
-        switch (type) {
-        case 0:         return __kmap_atomic_primary(0, paddr, 2);
-        case 1:         return __kmap_atomic_primary(1, paddr, 3);
-        case 2:         return __kmap_atomic_primary(2, paddr, 4);
-        case 3:         return __kmap_atomic_primary(3, paddr, 5);
-
-        default:
-                BUG();
-                return NULL;
-        }
+        return __kmap_atomic_primary(1, paddr, 2);
 }
 
-#define __kunmap_atomic_primary(type, ampr)                             \
+#define __kunmap_atomic_primary(cached, ampr)                           \
 do {                                                                    \
         asm volatile("movgs gr0,dampr"#ampr"\n" ::: "memory");          \
-        if (type == __KM_CACHE)                                         \
+        if (cached)                                                     \
                 asm volatile("movgs gr0,iampr"#ampr"\n" ::: "memory");  \
 } while(0)
 
@@ -143,17 +135,9 @@ do {									\
         asm volatile("tlbpr %0,gr0,#4,#1" : : "r"(vaddr) : "memory");   \
 } while(0)
 
-static inline void kunmap_atomic_primary(void *kvaddr, enum km_type type)
+static inline void kunmap_atomic_primary(void *kvaddr)
 {
-        switch (type) {
-        case 0:         __kunmap_atomic_primary(0, 2);  break;
-        case 1:         __kunmap_atomic_primary(1, 3);  break;
-        case 2:         __kunmap_atomic_primary(2, 4);  break;
-        case 3:         __kunmap_atomic_primary(3, 5);  break;
-
-        default:
-                BUG();
-        }
+        __kunmap_atomic_primary(1, 2);
         pagefault_enable();
 }
 
diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
index f8e16b2a5804..43901f220963 100644
--- a/arch/frv/include/asm/kmap_types.h
+++ b/arch/frv/include/asm/kmap_types.h
@@ -2,28 +2,6 @@
 #ifndef _ASM_KMAP_TYPES_H
 #define _ASM_KMAP_TYPES_H
 
-enum km_type {
-        /* arch specific kmaps - change the numbers attached to these at your peril */
-        __KM_CACHE,             /* cache flush page attachment point */
-        __KM_PGD,               /* current page directory */
-        __KM_ITLB_PTD,          /* current instruction TLB miss page table lookup */
-        __KM_DTLB_PTD,          /* current data TLB miss page table lookup */
-
-        /* general kmaps */
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
+#define KM_TYPE_NR 17
 
 #endif
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c
index 4f8d8bcdc7de..82478979ac9a 100644
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
@@ -62,14 +62,14 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
         dampr2 = __get_DAMPR(2);
 
         for (i = 0; i < nents; i++) {
-                vaddr = kmap_atomic_primary(sg_page(&sg[i]), __KM_CACHE);
+                vaddr = kmap_atomic_primary(sg_page(&sg[i]));
 
                 frv_dcache_writeback((unsigned long) vaddr,
                                      (unsigned long) vaddr + PAGE_SIZE);
 
         }
 
-        kunmap_atomic_primary(vaddr, __KM_CACHE);
+        kunmap_atomic_primary(vaddr);
         if (dampr2) {
                 __set_DAMPR(2, dampr2);
                 __set_IAMPR(2, dampr2);
diff --git a/arch/frv/mm/cache-page.c b/arch/frv/mm/cache-page.c
index b24ade27a0f0..8e09dae0ec3f 100644
--- a/arch/frv/mm/cache-page.c
+++ b/arch/frv/mm/cache-page.c
@@ -26,11 +26,11 @@ void flush_dcache_page(struct page *page)
 
         dampr2 = __get_DAMPR(2);
 
-        vaddr = kmap_atomic_primary(page, __KM_CACHE);
+        vaddr = kmap_atomic_primary(page);
 
         frv_dcache_writeback((unsigned long) vaddr, (unsigned long) vaddr + PAGE_SIZE);
 
-        kunmap_atomic_primary(vaddr, __KM_CACHE);
+        kunmap_atomic_primary(vaddr);
 
         if (dampr2) {
                 __set_DAMPR(2, dampr2);
@@ -54,12 +54,12 @@ void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
 
         dampr2 = __get_DAMPR(2);
 
-        vaddr = kmap_atomic_primary(page, __KM_CACHE);
+        vaddr = kmap_atomic_primary(page);
 
         start = (start & ~PAGE_MASK) | (unsigned long) vaddr;
         frv_cache_wback_inv(start, start + len);
 
-        kunmap_atomic_primary(vaddr, __KM_CACHE);
+        kunmap_atomic_primary(vaddr);
 
         if (dampr2) {
                 __set_DAMPR(2, dampr2);
diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c
index 31902c9d5be5..bed9a9bd3c10 100644
--- a/arch/frv/mm/highmem.c
+++ b/arch/frv/mm/highmem.c
@@ -50,11 +50,11 @@ void *kmap_atomic(struct page *page)
         /*
          * The first 4 primary maps are reserved for architecture code
          */
-        case 0:         return __kmap_atomic_primary(4, paddr, 6);
-        case 1:         return __kmap_atomic_primary(5, paddr, 7);
-        case 2:         return __kmap_atomic_primary(6, paddr, 8);
-        case 3:         return __kmap_atomic_primary(7, paddr, 9);
-        case 4:         return __kmap_atomic_primary(8, paddr, 10);
+        case 0:         return __kmap_atomic_primary(0, paddr, 6);
+        case 1:         return __kmap_atomic_primary(0, paddr, 7);
+        case 2:         return __kmap_atomic_primary(0, paddr, 8);
+        case 3:         return __kmap_atomic_primary(0, paddr, 9);
+        case 4:         return __kmap_atomic_primary(0, paddr, 10);
 
         case 5 ... 5 + NR_TLB_LINES - 1:
                 return __kmap_atomic_secondary(type - 5, paddr);
@@ -70,11 +70,11 @@ void __kunmap_atomic(void *kvaddr)
 {
         int type = kmap_atomic_idx();
         switch (type) {
-        case 0:         __kunmap_atomic_primary(4, 6);  break;
-        case 1:         __kunmap_atomic_primary(5, 7);  break;
-        case 2:         __kunmap_atomic_primary(6, 8);  break;
-        case 3:         __kunmap_atomic_primary(7, 9);  break;
-        case 4:         __kunmap_atomic_primary(8, 10); break;
+        case 0:         __kunmap_atomic_primary(0, 6);  break;
+        case 1:         __kunmap_atomic_primary(0, 7);  break;
+        case 2:         __kunmap_atomic_primary(0, 8);  break;
+        case 3:         __kunmap_atomic_primary(0, 9);  break;
+        case 4:         __kunmap_atomic_primary(0, 10); break;
 
         case 5 ... 5 + NR_TLB_LINES - 1:
                 __kunmap_atomic_secondary(type - 5, kvaddr);
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
index bca8fdcd2542..5acabbd7ac6f 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/arch/powerpc/include/asm/kmap_types.h
@@ -10,36 +10,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_PPC_SYNC_PAGE,
-        KM_PPC_SYNC_ICACHE,
-        KM_KDB,
-        KM_TYPE_NR
-};
-
-/*
- * This is a temporary build fix that (so they say on lkml....) should no longer
- * be required after 2.6.33, because of changes planned to the kmap code.
- * Let's try to remove this cruft then.
- */
-#ifdef CONFIG_DEBUG_HIGHMEM
-#define KM_NMI          (-1)
-#define KM_NMI_PTE      (-1)
-#define KM_IRQ_PTE      (-1)
-#endif
+#define KM_TYPE_NR 16
 
 #endif  /* __KERNEL__ */
 #endif  /* _ASM_POWERPC_KMAP_TYPES_H */
diff --git a/arch/tile/include/asm/kmap_types.h b/arch/tile/include/asm/kmap_types.h
index 3d0f20246260..92b28e3e9972 100644
--- a/arch/tile/include/asm/kmap_types.h
+++ b/arch/tile/include/asm/kmap_types.h
@@ -23,35 +23,6 @@
  * adds 4MB of required address-space.  For now we leave KM_TYPE_NR
  * set to depth 8.
  */
-enum km_type {
-        KM_TYPE_NR = 8
-};
-
-/*
- * We provide dummy definitions of all the stray values that used to be
- * required for kmap_atomic() and no longer are.
- */
-enum {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_SYNC_ICACHE,
-        KM_SYNC_DCACHE,
-        KM_UML_USERCOPY,
-        KM_IRQ_PTE,
-        KM_NMI,
-        KM_NMI_PTE,
-        KM_KDB
-};
+#define KM_TYPE_NR 8
 
 #endif /* _ASM_TILE_KMAP_TYPES_H */
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index ef8e5a62b6e3..347d123b14be 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -93,7 +93,7 @@ static DEFINE_PER_CPU(struct kmap_amps, amps);
  * If we examine it earlier we are exposed to a race where it looks
  * writable earlier, but becomes immutable before we write the PTE.
  */
-static void kmap_atomic_register(struct page *page, enum km_type type,
+static void kmap_atomic_register(struct page *page, int type,
                                  unsigned long va, pte_t *ptep, pte_t pteval)
 {
         unsigned long flags;
diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
index 6c03acdb4405..2e0a6b1d8300 100644
--- a/arch/um/include/asm/kmap_types.h
+++ b/arch/um/include/asm/kmap_types.h
@@ -8,22 +8,6 @@
 
 /* No more #include "asm/arch/kmap_types.h" ! */
 
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_UML_USERCOPY,        /* UML specific, for copy_*_user - used in do_op_one_page */
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
+#define KM_TYPE_NR 14
 
 #endif