Skip to contentSkip to conversation

arch/tile: support new kunmap_atomic() naming convention.

PATCH New Chris Metcalf 1 participant 1 message Aug 11, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch/tile: support new kunmap_atomic() naming convention.

See commit 597781f3e51f48ef8e67be772196d9e9673752c4.

---
 arch/tile/include/asm/highmem.h |    2 +-
 arch/tile/mm/highmem.c          |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/tile/include/asm/highmem.h +1 -1
index efdd12e..d155db6 100644
@@ -60,7 +60,7 @@ void *kmap_fix_kpte(struct page *page, int finished);
 /* This macro is used only in map_new_virtual() to map "page". */
 #define kmap_prot page_to_kpgprot(page)
 
-void kunmap_atomic(void *kvaddr, enum km_type type);
+void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type);
 void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
 void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
 struct page *kmap_atomic_to_page(void *ptr);
arch/tile/mm/highmem.c +2 -2
index ff1cdff..12ab137 100644
@@ -276,7 +276,7 @@ void *kmap_atomic(struct page *page, enum km_type type)
 }
 EXPORT_SYMBOL(kmap_atomic);
 
-void kunmap_atomic(void *kvaddr, enum km_type type)
+void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type)
 {
 	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
 	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
@@ -300,7 +300,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
 	arch_flush_lazy_mmu_mode();
 	pagefault_enable();
 }
-EXPORT_SYMBOL(kunmap_atomic);
+EXPORT_SYMBOL(kunmap_atomic_notypecheck);
 
 /*
  * This API is supposed to allow us to map memory without a "struct page".
Signature · 1 line
1.6.5.2