UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

parisc: fix compile failure with kmap_atomic changes 

Commit 3e4d3af501 ("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>
This commit is contained in:
James Bottomley 2010-10-28 10:14:41 -05:00 committed by Linus Torvalds
parent b31d42a5af
commit 765aaafe38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/parisc/include/asm/cacheflush.h
View File

@ -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