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/frv | |
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/frv')
-rw-r--r-- | arch/frv/include/asm/highmem.h | 2 | ||||
-rw-r--r-- | arch/frv/mm/highmem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/frv/include/asm/highmem.h b/arch/frv/include/asm/highmem.h index a8d6565d415..716956a5317 100644 --- a/arch/frv/include/asm/highmem.h +++ b/arch/frv/include/asm/highmem.h | |||
@@ -157,7 +157,7 @@ static inline void kunmap_atomic_primary(void *kvaddr, enum km_type type) | |||
157 | pagefault_enable(); | 157 | pagefault_enable(); |
158 | } | 158 | } |
159 | 159 | ||
160 | void *__kmap_atomic(struct page *page); | 160 | void *kmap_atomic(struct page *page); |
161 | void __kunmap_atomic(void *kvaddr); | 161 | void __kunmap_atomic(void *kvaddr); |
162 | 162 | ||
163 | #endif /* !__ASSEMBLY__ */ | 163 | #endif /* !__ASSEMBLY__ */ |
diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c index fd7fcd4c2e3..31902c9d5be 100644 --- a/arch/frv/mm/highmem.c +++ b/arch/frv/mm/highmem.c | |||
@@ -37,7 +37,7 @@ struct page *kmap_atomic_to_page(void *ptr) | |||
37 | return virt_to_page(ptr); | 37 | return virt_to_page(ptr); |
38 | } | 38 | } |
39 | 39 | ||
40 | void *__kmap_atomic(struct page *page) | 40 | void *kmap_atomic(struct page *page) |
41 | { | 41 | { |
42 | unsigned long paddr; | 42 | unsigned long paddr; |
43 | int type; | 43 | int type; |
@@ -64,7 +64,7 @@ void *__kmap_atomic(struct page *page) | |||
64 | return NULL; | 64 | return NULL; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | EXPORT_SYMBOL(__kmap_atomic); | 67 | EXPORT_SYMBOL(kmap_atomic); |
68 | 68 | ||
69 | void __kunmap_atomic(void *kvaddr) | 69 | void __kunmap_atomic(void *kvaddr) |
70 | { | 70 | { |