aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/highmem.h
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2011-11-25 21:53:39 -0500
committerCong Wang <xiyou.wangcong@gmail.com>2012-03-20 09:48:30 -0400
commita24401bcf4a67c8fe17e649e74eeb09b08b79ef5 (patch)
treec4b1be87e0a63057e85ae82076d54c437313b1f8 /include/linux/highmem.h
parent589973a7042f5a91a5b8bf78a32c97ae073e2c72 (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 'include/linux/highmem.h')
-rw-r--r--include/linux/highmem.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 284ec5535f3d..6549ed75e0a7 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -55,12 +55,12 @@ static inline void kunmap(struct page *page)
55{ 55{
56} 56}
57 57
58static inline void *__kmap_atomic(struct page *page) 58static inline void *kmap_atomic(struct page *page)
59{ 59{
60 pagefault_disable(); 60 pagefault_disable();
61 return page_address(page); 61 return page_address(page);
62} 62}
63#define kmap_atomic_prot(page, prot) __kmap_atomic(page) 63#define kmap_atomic_prot(page, prot) kmap_atomic(page)
64 64
65static inline void __kunmap_atomic(void *addr) 65static inline void __kunmap_atomic(void *addr)
66{ 66{
@@ -121,15 +121,10 @@ static inline void kmap_atomic_idx_pop(void)
121#define NARG_(_2, _1, n, ...) n 121#define NARG_(_2, _1, n, ...) n
122#define NARG(...) NARG_(__VA_ARGS__, 2, 1, :) 122#define NARG(...) NARG_(__VA_ARGS__, 2, 1, :)
123 123
124static inline void *kmap_atomic(struct page *page)
125{
126 return __kmap_atomic(page);
127}
128
129static inline void __deprecated *kmap_atomic_deprecated(struct page *page, 124static inline void __deprecated *kmap_atomic_deprecated(struct page *page,
130 enum km_type km) 125 enum km_type km)
131{ 126{
132 return __kmap_atomic(page); 127 return kmap_atomic(page);
133} 128}
134 129
135#define kmap_atomic1(...) kmap_atomic(__VA_ARGS__) 130#define kmap_atomic1(...) kmap_atomic(__VA_ARGS__)