Skip to content

Commit

Permalink
parisc: fix compile failure with kmap_atomic changes
Browse files Browse the repository at this point in the history
Commit 3e4d3af ("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>
  • Loading branch information
James Bottomley authored and Linus Torvalds committed Oct 28, 2010
1 parent b31d42a commit 765aaaf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/parisc/include/asm/cacheflush.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,20 @@ static inline void *kmap(struct page *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();
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);
pagefault_enable();
}

#define kmap_atomic_prot(page, idx, prot) kmap_atomic(page, idx)
#define kmap_atomic_pfn(pfn, idx) kmap_atomic(pfn_to_page(pfn), (idx))
#define kmap_atomic_prot(page, prot) kmap_atomic(page)
#define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
#define kmap_atomic_to_page(ptr) virt_to_page(ptr)
#endif

Expand Down

0 comments on commit 765aaaf

Please sign in to comment.