The patch titled Subject: alpha: agp: make empty macros use do-while-0 style has been added to the -mm tree. Its filename is alpha-agp-make-empty-macros-use-do-while-0-style.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/alpha-agp-make-empty-macros-use-do-while-0-style.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/alpha-agp-make-empty-macros-use-do-while-0-style.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Subject: alpha: agp: make empty macros use do-while-0 style Copy these macros from ia64/include/asm/agp.h to avoid the "empty-body" in 'if' statment warning. drivers/char/agp/generic.c: In function 'agp_generic_destroy_page': ../drivers/char/agp/generic.c:1265:42: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] 1265 | unmap_page_from_agp(page); Link: https://lkml.kernel.org/r/20210809030822.20658-1-rdunlap@xxxxxxxxxxxxx Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Richard Henderson <rth@xxxxxxxxxxx> Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Cc: Matt Turner <mattst88@xxxxxxxxx> Cc: David Airlie <airlied@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/alpha/include/asm/agp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/alpha/include/asm/agp.h~alpha-agp-make-empty-macros-use-do-while-0-style +++ a/arch/alpha/include/asm/agp.h @@ -6,8 +6,8 @@ /* dummy for now */ -#define map_page_into_agp(page) -#define unmap_page_from_agp(page) +#define map_page_into_agp(page) do { } while (0) +#define unmap_page_from_agp(page) do { } while (0) #define flush_agp_cache() mb() /* GATT allocation. Returns/accepts GATT kernel virtual address. */ _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are alpha-agp-make-empty-macros-use-do-while-0-style.patch lib-dump_stack-correct-kernel-doc-notation.patch lib-iov_iterc-fix-kernel-doc-warnings.patch fs-epoll-use-a-per-cpu-counter-for-users-watches-count-fix.patch scripts-check_extable-fix-typo-in-user-error-message.patch