Commit 765aaafe authored by James Bottomley's avatar James Bottomley Committed by Linus Torvalds

parisc: fix compile failure with kmap_atomic changes

Commit 3e4d3af5 ("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: default avatarJames Bottomley <James.Bottomley@suse.de>
Acked-by: default avatarKyle McMartin <kyle@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b31d42a5
...@@ -126,20 +126,20 @@ static inline void *kmap(struct page *page) ...@@ -126,20 +126,20 @@ static inline void *kmap(struct page *page)
#define kunmap(page) kunmap_parisc(page_address(page)) #define kunmap(page) kunmap_parisc(page_address(page))
static inline void *kmap_atomic(struct page *page, enum km_type idx) static inline void *__kmap_atomic(struct page *page)
{ {
pagefault_disable(); pagefault_disable();
return page_address(page); return page_address(page);
} }
static inline void kunmap_atomic_notypecheck(void *addr, enum km_type idx) static inline void __kunmap_atomic(void *addr)
{ {
kunmap_parisc(addr); kunmap_parisc(addr);
pagefault_enable(); pagefault_enable();
} }
#define kmap_atomic_prot(page, idx, prot) kmap_atomic(page, idx) #define kmap_atomic_prot(page, prot) kmap_atomic(page)
#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx)) #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
#define kmap_atomic_to_page(ptr) virt_to_page(ptr) #define kmap_atomic_to_page(ptr) virt_to_page(ptr)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment