aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/highmem.h4
-rw-r--r--arch/mips/mm/highmem.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h
index 25adfb02923d..75753ca73bfd 100644
--- a/arch/mips/include/asm/highmem.h
+++ b/arch/mips/include/asm/highmem.h
@@ -48,14 +48,14 @@ extern void kunmap_high(struct page *page);
48extern void *__kmap(struct page *page); 48extern void *__kmap(struct page *page);
49extern void __kunmap(struct page *page); 49extern void __kunmap(struct page *page);
50extern void *__kmap_atomic(struct page *page, enum km_type type); 50extern void *__kmap_atomic(struct page *page, enum km_type type);
51extern void __kunmap_atomic(void *kvaddr, enum km_type type); 51extern void __kunmap_atomic_notypecheck(void *kvaddr, enum km_type type);
52extern void *kmap_atomic_pfn(unsigned long pfn, enum km_type type); 52extern void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
53extern struct page *__kmap_atomic_to_page(void *ptr); 53extern struct page *__kmap_atomic_to_page(void *ptr);
54 54
55#define kmap __kmap 55#define kmap __kmap
56#define kunmap __kunmap 56#define kunmap __kunmap
57#define kmap_atomic __kmap_atomic 57#define kmap_atomic __kmap_atomic
58#define kunmap_atomic __kunmap_atomic 58#define kunmap_atomic_notypecheck __kunmap_atomic_notypecheck
59#define kmap_atomic_to_page __kmap_atomic_to_page 59#define kmap_atomic_to_page __kmap_atomic_to_page
60 60
61#define flush_cache_kmaps() flush_cache_all() 61#define flush_cache_kmaps() flush_cache_all()
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index 127d732474bf..6a2b1bf9ef11 100644
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -64,7 +64,7 @@ void *__kmap_atomic(struct page *page, enum km_type type)
64} 64}
65EXPORT_SYMBOL(__kmap_atomic); 65EXPORT_SYMBOL(__kmap_atomic);
66 66
67void __kunmap_atomic(void *kvaddr, enum km_type type) 67void __kunmap_atomic_notypecheck(void *kvaddr, enum km_type type)
68{ 68{
69#ifdef CONFIG_DEBUG_HIGHMEM 69#ifdef CONFIG_DEBUG_HIGHMEM
70 unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; 70 unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
@@ -87,7 +87,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
87 87
88 pagefault_enable(); 88 pagefault_enable();
89} 89}
90EXPORT_SYMBOL(__kunmap_atomic); 90EXPORT_SYMBOL(__kunmap_atomic_notypecheck);
91 91
92/* 92/*
93 * This is the same as kmap_atomic() but can map memory that doesn't 93 * This is the same as kmap_atomic() but can map memory that doesn't