arch/kunmap_atomic: consolidate duplicate code

[sfrench/cifs-2.6.git] / arch / sparc / mm / highmem.c

diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c
index b53070ab6a31e7a57a533da50da2d5ac5e61bcab..06798ae813b947ef82dbd0bd634a0e94d34537ce 100644 (file)
--- a/arch/sparc/mm/highmem.c
+++ b/arch/sparc/mm/highmem.c
@@ -84,16 +84,13 @@ void *kmap_atomic_high(struct page *page)
 }
 EXPORT_SYMBOL(kmap_atomic_high);
 
-void __kunmap_atomic(void *kvaddr)
+void kunmap_atomic_high(void *kvaddr)
 {
        unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
        int type;
 
-       if (vaddr < FIXADDR_START) { // FIXME
-               pagefault_enable();
-               preempt_enable();
+       if (vaddr < FIXADDR_START)
                return;
-       }
 
        type = kmap_atomic_idx();
 
@@ -126,7 +123,5 @@ void __kunmap_atomic(void *kvaddr)
 #endif
 
        kmap_atomic_idx_pop();
-       pagefault_enable();
-       preempt_enable();
 }
-EXPORT_SYMBOL(__kunmap_atomic);
+EXPORT_SYMBOL(kunmap_atomic_high);