diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-11 10:54:13 -0400 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-11 10:54:13 -0400 |
commit | b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8 (patch) | |
tree | 5ee968e4781666f008eb671019ce0293d607a859 /arch | |
parent | bae918ac280f01a4fa89b570643def7bb276f597 (diff) | |
download | linux-3.10-b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8.tar.gz linux-3.10-b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8.tar.bz2 linux-3.10-b77c49ab6d9bfe4d8207e1df72a1978fdd0a96b8.zip |
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.h | 2 | ||||
-rw-r--r-- | arch/tile/mm/highmem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/tile/include/asm/highmem.h b/arch/tile/include/asm/highmem.h index efdd12e9102..d155db6fa9b 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); /* 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/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c index ff1cdff5114..12ab137e7d4 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) } 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". |