aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-08-11 10:54:13 -0400
committerChris Metcalf <cmetcalf@tilera.com>2010-08-11 10:54:13 -0400
commitb77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8 (patch)
tree5ee968e4781666f008eb671019ce0293d607a859 /arch
parentbae918ac280f01a4fa89b570643def7bb276f597 (diff)
arch/tile: support new kunmap_atomic() naming convention.
See commit 597781f3e51f48ef8e67be772196d9e9673752c4. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/tile/include/asm/highmem.h2
-rw-r--r--arch/tile/mm/highmem.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/tile/include/asm/highmem.h b/arch/tile/include/asm/highmem.h
index efdd12e91020..d155db6fa9bd 100644
--- a/arch/tile/include/asm/highmem.h
+++ b/arch/tile/include/asm/highmem.h
@@ -60,7 +60,7 @@ void *kmap_fix_kpte(struct page *page, int finished);
60/* This macro is used only in map_new_virtual() to map "page". */ 60/* This macro is used only in map_new_virtual() to map "page". */
61#define kmap_prot page_to_kpgprot(page) 61#define kmap_prot page_to_kpgprot(page)
62 62
63void kunmap_atomic(void *kvaddr, enum km_type type); 63void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type);
64void *kmap_atomic_pfn(unsigned long pfn, enum km_type type); 64void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
65void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot); 65void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
66struct page *kmap_atomic_to_page(void *ptr); 66struct page *kmap_atomic_to_page(void *ptr);
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index ff1cdff5114d..12ab137e7d4f 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -276,7 +276,7 @@ void *kmap_atomic(struct page *page, enum km_type type)
276} 276}
277EXPORT_SYMBOL(kmap_atomic); 277EXPORT_SYMBOL(kmap_atomic);
278 278
279void kunmap_atomic(void *kvaddr, enum km_type type) 279void kunmap_atomic_notypecheck(void *kvaddr, enum km_type type)
280{ 280{
281 unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; 281 unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
282 enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id(); 282 enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
@@ -300,7 +300,7 @@ void kunmap_atomic(void *kvaddr, enum km_type type)
300 arch_flush_lazy_mmu_mode(); 300 arch_flush_lazy_mmu_mode();
301 pagefault_enable(); 301 pagefault_enable();
302} 302}
303EXPORT_SYMBOL(kunmap_atomic); 303EXPORT_SYMBOL(kunmap_atomic_notypecheck);
304 304
305/* 305/*
306 * This API is supposed to allow us to map memory without a "struct page". 306 * This API is supposed to allow us to map memory without a "struct page".