linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: axel.lin@gmail.com (Axel Lin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] highmem: fix missed kmap_atomic update in arch/arm/include/asm/highmem.h
Date: Wed, 07 Dec 2011 17:21:59 +0800	[thread overview]
Message-ID: <1323249719.27710.2.camel@phoenix> (raw)

commit 37bfbb "highmem: kill all __kmap_atomic()" missed the update to
arch/arm/include/asm/highmem.h.

This patch fixes below build error:
  CC      init/main.o
In file included from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:70,
                 from init/main.c:49:
include/linux/highmem.h: In function 'kmap_atomic_deprecated':
include/linux/highmem.h:127: error: implicit declaration of function 'kmap_atomic'
include/linux/highmem.h:127: warning: return makes pointer from integer without a cast
include/linux/highmem.h: In function 'clear_highpage':
include/linux/highmem.h:218: warning: initialization makes pointer from integer without a cast
include/linux/highmem.h: In function 'zero_user_segments':
include/linux/highmem.h:227: warning: initialization makes pointer from integer without a cast
include/linux/highmem.h: In function 'copy_highpage':
include/linux/highmem.h:279: warning: assignment makes pointer from integer without a cast
include/linux/highmem.h:280: warning: assignment makes pointer from integer without a cast
make[1]: *** [init/main.o] Error 1
make: *** [init] Error 2

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I got the build error by "make tegra_defconfig;make" on linux-next 20111207.
Thus this patch is against linux-next tree.

BTW, why commit 37bfbb "highmem: kill all __kmap_atomic()" does not have any
Signed-off-by?

Axel
 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.5.4

             reply	other threads:[~2011-12-07  9:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-07  9:21 Axel Lin [this message]
2011-12-07  9:35 ` [PATCH] highmem: fix missed kmap_atomic update in arch/arm/include/asm/highmem.h Uwe Kleine-König
2011-12-07  9:41   ` 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=1323249719.27710.2.camel@phoenix \
    --to=axel.lin@gmail.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).