From: swarren@nvidia.com (Stephen Warren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] highmem: Fix ARM build break due to __kmap_atomic rename
Date: Tue, 6 Dec 2011 11:50:26 -0700 [thread overview]
Message-ID: <1323197426-10815-1-git-send-email-swarren@nvidia.com> (raw)
Git commit 37bfbb9 "highmem: kill all __kmap_atomic()" renamed
__kmap_atomic to kmap_atomic. However, arch/arm/include/asm/highmem.h
wasn't updated for that change. This change does so, and fixes the
ARM build break.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
This shows up in next-20111206 at least.
arch/arm/include/asm/highmem.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/highmem.h b/arch/arm/include/asm/highmem.h
index a4edd19..8c5e828 100644
--- a/arch/arm/include/asm/highmem.h
+++ b/arch/arm/include/asm/highmem.h
@@ -57,7 +57,7 @@ static inline void *kmap_high_get(struct page *page)
#ifdef CONFIG_HIGHMEM
extern void *kmap(struct page *page);
extern void kunmap(struct page *page);
-extern void *__kmap_atomic(struct page *page);
+extern void *kmap_atomic(struct page *page);
extern void __kunmap_atomic(void *kvaddr);
extern void *kmap_atomic_pfn(unsigned long pfn);
extern struct page *kmap_atomic_to_page(const void *ptr);
--
1.7.0.4
next reply other threads:[~2011-12-06 18:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-06 18:50 Stephen Warren [this message]
2011-12-06 19:41 ` [PATCH] highmem: Fix ARM build break due to __kmap_atomic rename Nicolas Pitre
2011-12-06 19:52 ` Stephen Warren
2011-12-07 9:26 ` Cong Wang
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=1323197426-10815-1-git-send-email-swarren@nvidia.com \
--to=swarren@nvidia.com \
--cc=linux-arm-kernel@lists.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).