The patch titled Subject: ia64: mca: always make IA64_MCA_DEBUG an expression has been added to the -mm tree. Its filename is ia64-mca-always-make-ia64_mca_debug-an-expression.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/ia64-mca-always-make-ia64_mca_debug-an-expression.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/ia64-mca-always-make-ia64_mca_debug-an-expression.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: Sergei Trofimovich <slyfox@xxxxxxxxxx> Subject: ia64: mca: always make IA64_MCA_DEBUG an expression At least ia64_mca_log_sal_error_record() expects some statement: static void ia64_mca_log_sal_error_record(int sal_info_type) { ... if (irq_safe) IA64_MCA_DEBUG("CPU %d: SAL log contains %s error record ", smp_processor_id(), sal_info_type < ARRAY_SIZE(rec_name) ? rec_name[sal_info_type] : "UNKNOWN"); ... } Instead of fixing all callers the change expicitly makes IA64_MCA_DEBUG a non-empty expression. Link: https://lkml.kernel.org/r/20210328215549.830420-1-slyfox@xxxxxxxxxx Signed-off-by: Sergei Trofimovich <slyfox@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/ia64/kernel/mca.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/ia64/kernel/mca.c~ia64-mca-always-make-ia64_mca_debug-an-expression +++ a/arch/ia64/kernel/mca.c @@ -109,9 +109,9 @@ #include "irq.h" #if defined(IA64_MCA_DEBUG_INFO) -# define IA64_MCA_DEBUG(fmt...) printk(fmt) +# define IA64_MCA_DEBUG(fmt...) printk(fmt) #else -# define IA64_MCA_DEBUG(fmt...) +# define IA64_MCA_DEBUG(fmt...) do {} while (0) #endif #define NOTIFY_INIT(event, regs, arg, spin) \ _ Patches currently in -mm which might be from slyfox@xxxxxxxxxx are ia64-drop-unused-ia64_fw_emu-ifdef.patch ia64-simplify-code-flow-around-swiotlb-init.patch ia64-fix-efi_debug-build.patch ia64-mca-always-make-ia64_mca_debug-an-expression.patch