From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: linux-mm <linux-mm@kvack.org>,
linux-arch <linux-arch@vger.kernel.org>,
Parisc List <linux-parisc@vger.kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH] parisc: fix compile failure with kmap_atomic changes
Date: Wed, 27 Oct 2010 13:35:47 -0500 [thread overview]
Message-ID: <1288204547.6886.23.camel@mulgrave.site> (raw)
This commit:
commit 3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue Oct 26 14:21:51 2010 -0700
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>
---
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index dba11ae..f388a85 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)
#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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next reply other threads:[~2010-10-27 18:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 18:35 James Bottomley [this message]
2010-10-28 5:18 ` [PATCH] parisc: fix compile failure with kmap_atomic changes John David Anglin
2010-10-28 14:03 ` James Bottomley
2010-10-28 17:13 ` John David Anglin
2010-10-28 17:39 ` James Bottomley
2010-10-28 18:11 ` John David Anglin
2010-10-28 14:16 ` Kyle McMartin
2010-10-28 14:26 ` James Bottomley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1288204547.6886.23.camel@mulgrave.site \
--to=james.bottomley@hansenpartnership.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-parisc@vger.kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).