From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by kanga.kvack.org (Postfix) with ESMTP id 28A0F6B0037 for ; Wed, 15 Jan 2014 04:34:01 -0500 (EST) Received: by mail-ea0-f182.google.com with SMTP id a15so321608eae.27 for ; Wed, 15 Jan 2014 01:34:00 -0800 (PST) Received: from juliette.telenet-ops.be (juliette.telenet-ops.be. [195.130.137.74]) by mx.google.com with ESMTP id n47si6571819eey.224.2014.01.15.01.33.56 for ; Wed, 15 Jan 2014 01:34:00 -0800 (PST) From: Geert Uytterhoeven Subject: [PATCH] mm: Make {,set}page_address() static inline if WANT_PAGE_VIRTUAL Date: Wed, 15 Jan 2014 10:33:46 +0100 Message-Id: <1389778426-14836-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton , Guenter Roeck , "Michael S. Tsirkin" Cc: linux-mm@kvack.org, linux-bcache@vger.kernel.org, Vineet Gupta , sparclinux@vger.kernel.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven {,set}page_address() are macros if WANT_PAGE_VIRTUAL. If !WANT_PAGE_VIRTUAL, they're plain C functions. If someone calls them with a void *, this pointer is auto-converted to struct page * if !WANT_PAGE_VIRTUAL, but causes a build failure on architectures using WANT_PAGE_VIRTUAL (arc, m68k and sparc): drivers/md/bcache/bset.c: In function a??__btree_sorta??: drivers/md/bcache/bset.c:1190: warning: dereferencing a??void *a?? pointer drivers/md/bcache/bset.c:1190: error: request for member a??virtuala?? in something not a structure or union Convert them to static inline functions to fix this. There are already plenty of users of struct page members inside , so there's no reason to keep them as macros. Signed-off-by: Geert Uytterhoeven --- http://kisskb.ellerman.id.au/kisskb/buildresult/10469287/ (m68k/next) http://kisskb.ellerman.id.au/kisskb/buildresult/10469488/ (sparc64/next) https://lkml.org/lkml/2014/1/13/1044 (m68k & sparc/3.10.27-stable) include/linux/mm.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 35527173cf50..9fac6dd69b11 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -846,11 +846,14 @@ static __always_inline void *lowmem_page_address(const struct page *page) #endif #if defined(WANT_PAGE_VIRTUAL) -#define page_address(page) ((page)->virtual) -#define set_page_address(page, address) \ - do { \ - (page)->virtual = (address); \ - } while(0) +static inline void *page_address(const struct page *page) +{ + return page->virtual; +} +static inline void set_page_address(struct page *page, void *address) +{ + page->virtual = address; +} #define page_address_init() do { } while(0) #endif -- 1.7.9.5 -- 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: email@kvack.org