diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-01-21 15:48:47 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-25 08:27:12 -0800 |
| commit | 2d36355274980e716b832710e8d18b6396594d4e (patch) | |
| tree | 77cecde9949834ce08792390d5be958118228ef9 /include | |
| parent | c44bc4496d29b70f95f2197eb950581a455c92a8 (diff) | |
| download | linux-stable-2d36355274980e716b832710e8d18b6396594d4e.tar.gz linux-stable-2d36355274980e716b832710e8d18b6396594d4e.tar.bz2 linux-stable-2d36355274980e716b832710e8d18b6396594d4e.zip | |
mm: Make {,set}page_address() static inline if WANT_PAGE_VIRTUAL
commit f92f455f67fef27929e6043499414605b0c94872 upstream.
{,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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index e0c8528a41a4..3bf21c3502d0 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -766,11 +766,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 |