Commit f92f455f authored Jan 21, 2014 by Geert Uytterhoeven Committed by Linus Torvalds Jan 21, 2014

mm: Make {,set}page_address() static inline if WANT_PAGE_VIRTUAL



{,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 sparc64):

  drivers/md/bcache/bset.c: In function `__btree_sort':
  drivers/md/bcache/bset.c:1190: warning: dereferencing `void *' pointer
  drivers/md/bcache/bset.c:1190: error: request for member `virtual' 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 <linux/mm.h>, so there's
no reason to keep them as macros.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent af52b040

include/linux/mm.h

+8 −5

Original line number	Diff line number	Diff line
		@@ -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

Admin message