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/tile | |
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/tile')
-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 b2a6c5de79ab..fc8429a31c85 100644 --- a/arch/tile/include/asm/highmem.h +++ b/arch/tile/include/asm/highmem.h | |||
@@ -59,7 +59,7 @@ void *kmap_fix_kpte(struct page *page, int finished); | |||
59 | /* This macro is used only in map_new_virtual() to map "page". */ | 59 | /* This macro is used only in map_new_virtual() to map "page". */ |
60 | #define kmap_prot page_to_kpgprot(page) | 60 | #define kmap_prot page_to_kpgprot(page) |
61 | 61 | ||
62 | void *__kmap_atomic(struct page *page); | 62 | void *kmap_atomic(struct page *page); |
63 | void __kunmap_atomic(void *kvaddr); | 63 | void __kunmap_atomic(void *kvaddr); |
64 | void *kmap_atomic_pfn(unsigned long pfn); | 64 | void *kmap_atomic_pfn(unsigned long pfn); |
65 | void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot); | 65 | void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot); |
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c index 31dbbd9afe47..ef8e5a62b6e3 100644 --- a/arch/tile/mm/highmem.c +++ b/arch/tile/mm/highmem.c | |||
@@ -224,12 +224,12 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) | |||
224 | } | 224 | } |
225 | EXPORT_SYMBOL(kmap_atomic_prot); | 225 | EXPORT_SYMBOL(kmap_atomic_prot); |
226 | 226 | ||
227 | void *__kmap_atomic(struct page *page) | 227 | void *kmap_atomic(struct page *page) |
228 | { | 228 | { |
229 | /* PAGE_NONE is a magic value that tells us to check immutability. */ | 229 | /* PAGE_NONE is a magic value that tells us to check immutability. */ |
230 | return kmap_atomic_prot(page, PAGE_NONE); | 230 | return kmap_atomic_prot(page, PAGE_NONE); |
231 | } | 231 | } |
232 | EXPORT_SYMBOL(__kmap_atomic); | 232 | EXPORT_SYMBOL(kmap_atomic); |
233 | 233 | ||
234 | void __kunmap_atomic(void *kvaddr) | 234 | void __kunmap_atomic(void *kvaddr) |
235 | { | 235 | { |