diff options
| author | Cong Wang <amwang@redhat.com> | 2011-11-26 10:53:39 +0800 |
|---|---|---|
| committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 21:48:30 +0800 |
| commit | a24401bcf4a67c8fe17e649e74eeb09b08b79ef5 (patch) | |
| tree | c4b1be87e0a63057e85ae82076d54c437313b1f8 /arch/frv | |
| parent | 589973a7042f5a91a5b8bf78a32c97ae073e2c72 (diff) | |
| download | linux-3.10-a24401bcf4a67c8fe17e649e74eeb09b08b79ef5.tar.gz linux-3.10-a24401bcf4a67c8fe17e649e74eeb09b08b79ef5.tar.bz2 linux-3.10-a24401bcf4a67c8fe17e649e74eeb09b08b79ef5.zip | |
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) pagefault_enable(); } -void *__kmap_atomic(struct page *page); +void *kmap_atomic(struct page *page); void __kunmap_atomic(void *kvaddr); #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) return virt_to_page(ptr); } -void *__kmap_atomic(struct page *page) +void *kmap_atomic(struct page *page) { unsigned long paddr; int type; @@ -64,7 +64,7 @@ void *__kmap_atomic(struct page *page) return NULL; } } -EXPORT_SYMBOL(__kmap_atomic); +EXPORT_SYMBOL(kmap_atomic); void __kunmap_atomic(void *kvaddr) { |