From 4e1cc0fff280ecb0b53cea209712db6bb12ba012 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Wed, 11 Aug 2010 10:54:13 -0400
Subject: [PATCH] --- yaml --- r: 209471 b: refs/heads/master c:
 b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8 h: refs/heads/master i:   209469:
 eb5dd392ae320cbb7b70ee0d8c0742154f374580   209467:
 3dcf965b519cdacffc02e99e8ac0cea27e58e965   209463:
 fcdbe09cf8526a9df8c5020c0e605726bd1c10de   209455:
 5ad9592f1a66e18646af3360bd4d54148b5bc8f1   209439:
 2797c15754673f54a4a96d0d23e20f8ae923957a   209407:
 824dce00acc2d2c332c689c7ee55bcbb25e736e4 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/tile/include/asm/highmem.h | 2 +-
 trunk/arch/tile/mm/highmem.c          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 38c740656f49..aaddff22f4f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bae918ac280f01a4fa89b570643def7bb276f597
+refs/heads/master: b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8
diff --git a/trunk/arch/tile/include/asm/highmem.h b/trunk/arch/tile/include/asm/highmem.h
index efdd12e91020..d155db6fa9bd 100644
--- a/trunk/arch/tile/include/asm/highmem.h
+++ b/trunk/arch/tile/include/asm/highmem.h
@@ -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);
diff --git a/trunk/arch/tile/mm/highmem.c b/trunk/arch/tile/mm/highmem.c
index ff1cdff5114d..12ab137e7d4f 100644
--- a/trunk/arch/tile/mm/highmem.c
+++ b/trunk/arch/tile/mm/highmem.c
@@ -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".