diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 21:53:39 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:30 -0400 |
commit | a24401bcf4a67c8fe17e649e74eeb09b08b79ef5 (patch) | |
tree | c4b1be87e0a63057e85ae82076d54c437313b1f8 /arch/mips | |
parent | 589973a7042f5a91a5b8bf78a32c97ae073e2c72 (diff) |
highmem: kill all __kmap_atomic()
[swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/highmem.h | 2 | ||||
-rw-r--r-- | arch/mips/mm/highmem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/highmem.h b/arch/mips/include/asm/highmem.h index 77e644082a3b..2d91888c9b74 100644 --- a/arch/mips/include/asm/highmem.h +++ b/arch/mips/include/asm/highmem.h | |||
@@ -47,7 +47,7 @@ extern void kunmap_high(struct page *page); | |||
47 | 47 | ||
48 | extern void *kmap(struct page *page); | 48 | extern void *kmap(struct page *page); |
49 | extern void kunmap(struct page *page); | 49 | extern void kunmap(struct page *page); |
50 | extern void *__kmap_atomic(struct page *page); | 50 | extern void *kmap_atomic(struct page *page); |
51 | extern void __kunmap_atomic(void *kvaddr); | 51 | extern void __kunmap_atomic(void *kvaddr); |
52 | extern void *kmap_atomic_pfn(unsigned long pfn); | 52 | extern void *kmap_atomic_pfn(unsigned long pfn); |
53 | extern struct page *kmap_atomic_to_page(void *ptr); | 53 | extern struct page *kmap_atomic_to_page(void *ptr); |
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c index 3634c7ea06ac..aff57057a949 100644 --- a/arch/mips/mm/highmem.c +++ b/arch/mips/mm/highmem.c | |||
@@ -41,7 +41,7 @@ EXPORT_SYMBOL(kunmap); | |||
41 | * kmaps are appropriate for short, tight code paths only. | 41 | * kmaps are appropriate for short, tight code paths only. |
42 | */ | 42 | */ |
43 | 43 | ||
44 | void *__kmap_atomic(struct page *page) | 44 | void *kmap_atomic(struct page *page) |
45 | { | 45 | { |
46 | unsigned long vaddr; | 46 | unsigned long vaddr; |
47 | int idx, type; | 47 | int idx, type; |
@@ -62,7 +62,7 @@ void *__kmap_atomic(struct page *page) | |||
62 | 62 | ||
63 | return (void*) vaddr; | 63 | return (void*) vaddr; |
64 | } | 64 | } |
65 | EXPORT_SYMBOL(__kmap_atomic); | 65 | EXPORT_SYMBOL(kmap_atomic); |
66 | 66 | ||
67 | void __kunmap_atomic(void *kvaddr) | 67 | void __kunmap_atomic(void *kvaddr) |
68 | { | 68 | { |