Re: [PATCH] s390: Add assembler-level include guard to insn-common-asm.h

[Andreas Grapentin]

On Nov 05 26, Andreas Grapentin wrote:
> The same should also work if we wrap the asm(.include...) in another
> header.

Something like this (compile tested):

diff --git a/arch/s390/include/asm/fpu-insn.h b/arch/s390/include/asm/fpu-insn.h
index eeb0a233d5c7..f1167aa2ab45 100644
--- a/arch/s390/include/asm/fpu-insn.h
+++ b/arch/s390/include/asm/fpu-insn.h
@@ -15,7 +15,7 @@
 #include <linux/kmsan.h>
 #include <asm/asm-extable.h>

-asm(".include \"asm/insn-common-asm.h\"\n");
+#include <asm/insn-common-asm-emit.h>
 asm(".include \"asm/fpu-insn-asm.h\"\n");

 /*
diff --git a/arch/s390/include/asm/insn-common-asm-emit.h b/arch/s390/include/asm/insn-common-asm-emit.h
new file mode 100644
index 000000000000..26a31e8439bf
--- /dev/null
+++ b/arch/s390/include/asm/insn-common-asm-emit.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __ASM_S390_INSN_COMMON_ASM_EMIT_H
+#define __ASM_S390_INSN_COMMON_ASM_EMIT_H
+
+asm(".include \"asm/insn-common-asm.h\"\n");
+
+#endif /* __ASM_S390_INSN_COMMON_ASM_EMIT_H */