Commit f92f455f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Tested-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af52b040
...@@ -846,11 +846,14 @@ static __always_inline void *lowmem_page_address(const struct page *page) ...@@ -846,11 +846,14 @@ static __always_inline void *lowmem_page_address(const struct page *page)
#endif #endif
#if defined(WANT_PAGE_VIRTUAL) #if defined(WANT_PAGE_VIRTUAL)
#define page_address(page) ((page)->virtual) static inline void *page_address(const struct page *page)
#define set_page_address(page, address) \ {
do { \ return page->virtual;
(page)->virtual = (address); \ }
} while(0) static inline void set_page_address(struct page *page, void *address)
{
page->virtual = address;
}
#define page_address_init() do { } while(0) #define page_address_init() do { } while(0)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment