Subject: [merged] mm-make-setpage_address-static-inline-if-want_page_virtual.patch removed from -mm tree To: geert@xxxxxxxxxxxxxx,linux@xxxxxxxxxxxx,mst@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 22 Jan 2014 12:12:15 -0800 The patch titled Subject: mm: Make {,set}page_address() static inline if WANT_PAGE_VIRTUAL has been removed from the -mm tree. Its filename was mm-make-setpage_address-static-inline-if-want_page_virtual.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> Subject: 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@xxxxxxxxxxxxxx> Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx> Tested-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/mm.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff -puN include/linux/mm.h~mm-make-setpage_address-static-inline-if-want_page_virtual include/linux/mm.h --- a/include/linux/mm.h~mm-make-setpage_address-static-inline-if-want_page_virtual +++ a/include/linux/mm.h @@ -846,11 +846,14 @@ static __always_inline void *lowmem_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 _ Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are origin.patch cris-provide-inout_p.patch asm-typesh-remove-include-asm-generic-int-l64h.patch maintainers-add-an-entry-for-the-macintosh-hfsplus-filesystem.patch init-mainc-remove-unused-declaration-of-tc_init.patch rtc-rtc-cmos-remove-superfluous-name-cast.patch rtc-disable-rtc_drv_cmos-on-atari.patch drivers-rtc-rtc-s5mc-s5m_rtc_suspendresume-should-depend-on-config_pm_sleep.patch proc-cleanup-simplify-get_task_state-task_state_array.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html