aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2010-10-28 11:14:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-28 12:02:15 -0400
commit765aaafe38050790301e89745b991dbdf3dded4c (patch)
treec48a40849009fe09aacf4744610595c38f8141dc /arch/parisc
parentb31d42a5af1818bdf31a5f023abe4d8b212542f2 (diff)
parisc: fix compile failure with kmap_atomic changes
Commit 3e4d3af501cc ("mm: stack based kmap_atomic()") overlooked the fact that parisc uses kmap as a coherence mechanism, so even though we have no highmem, we do need to supply our own versions of kmap (and atomic). This patch converts the parisc kmap to the form which is needed to keep it compiling (it's a simple prototype and name change). Signed-off-by: James Bottomley <James.Bottomley@suse.de> Acked-by: Kyle McMartin <kyle@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/include/asm/cacheflush.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index dba11aedce1b..f388a85bba11 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -126,20 +126,20 @@ static inline void *kmap(struct page *page)
126 126
127#define kunmap(page) kunmap_parisc(page_address(page)) 127#define kunmap(page) kunmap_parisc(page_address(page))
128 128
129static inline void *kmap_atomic(struct page *page, enum km_type idx) 129static inline void *__kmap_atomic(struct page *page)
130{ 130{
131 pagefault_disable(); 131 pagefault_disable();
132 return page_address(page); 132 return page_address(page);
133} 133}
134 134
135static inline void kunmap_atomic_notypecheck(void *addr, enum km_type idx) 135static inline void __kunmap_atomic(void *addr)
136{ 136{
137 kunmap_parisc(addr); 137 kunmap_parisc(addr);
138 pagefault_enable(); 138 pagefault_enable();
139} 139}
140 140
141#define kmap_atomic_prot(page, idx, prot) kmap_atomic(page, idx) 141#define kmap_atomic_prot(page, prot) kmap_atomic(page)
142#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx)) 142#define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
143#define kmap_atomic_to_page(ptr) virt_to_page(ptr) 143#define kmap_atomic_to_page(ptr) virt_to_page(ptr)
144#endif 144#endif
145 145