s390/tools: generate header files in arch/s390/include/generated/

Previously, the generated dis.h and facilities.h header files have been
stored in include/generated.  Because they are s390 specific, store them
in the arch/s390/include/generated/asm/ directory.  Also update
references to the header files respectively.

To prevent name collisions with those header files in asm/ that
include the generated ones, rename the generated headers files
and add an -defs suffix.  Also update the generators to create
the ifdef guards respectively.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 7b31e0626f08a9f9c41799cfdac43efdf9e123ad..fd691c4ff89ec2c6906be6bafa30b848fa7d9a31 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -138,8 +138,7 @@ archheaders:
 
 archprepare:
        $(Q)$(MAKE) $(build)=$(syscalls) kapi
-       $(Q)$(MAKE) $(build)=$(tools) include/generated/facilities.h
-       $(Q)$(MAKE) $(build)=$(tools) include/generated/dis.h
+       $(Q)$(MAKE) $(build)=$(tools) kapi
 
 # Don't use tabs in echo arguments
 define archhelp

diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 7b059510bed36dad305e199b0071ae6231f84ed7..c7afbac387611d96cbf857fc1dd95370f4e44599 100644 (file)
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -1,4 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
+generated-y += dis-defs.h
+generated-y += facility-defs.h
 generated-y += syscall_table.h
 generated-y += unistd_nr.h
 

diff --git a/arch/s390/include/asm/dis.h b/arch/s390/include/asm/dis.h
index b0480c60a8e106a1690d6b483d59383f647eb8c6..c18ed60919147cfc2f680db074cfcc34117c7d04 100644 (file)
--- a/arch/s390/include/asm/dis.h
+++ b/arch/s390/include/asm/dis.h
@@ -9,7 +9,7 @@
 #ifndef __ASM_S390_DIS_H__
 #define __ASM_S390_DIS_H__
 
-#include <generated/dis.h>
+#include <asm/dis-defs.h>
 
 static inline int insn_length(unsigned char code)
 {

diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h
index f040644575b7104c27d770e4f5b42ca85134be1b..fbe0c4be3cd8f117107ba8ac5d2ec50a31929258 100644 (file)
--- a/arch/s390/include/asm/facility.h
+++ b/arch/s390/include/asm/facility.h
@@ -8,7 +8,7 @@
 #ifndef __ASM_FACILITY_H
 #define __ASM_FACILITY_H
 
-#include <generated/facilities.h>
+#include <asm/facility-defs.h>
 #include <linux/string.h>
 #include <linux/preempt.h>
 #include <asm/lowcore.h>

diff --git a/arch/s390/tools/Makefile b/arch/s390/tools/Makefile
index 2e70e25de07aea8de3d405b3c04d14299329f7ee..48cdac1143a9f4c99f784535c13e41f5a6056da9 100644 (file)
--- a/arch/s390/tools/Makefile
+++ b/arch/s390/tools/Makefile
@@ -3,22 +3,33 @@
 # Makefile for s390 specific build tools
 #
 
+kapi := arch/$(ARCH)/include/generated/asm
+kapi-hdrs-y := $(kapi)/facility-defs.h $(kapi)/dis-defs.h
+
+targets += $(addprefix ../../../,$(kapi-hdrs-y))
+PHONY += kapi
+
+kapi:  $(kapi-hdrs-y)
+
 hostprogs-y                += gen_facilities
 hostprogs-y                += gen_opcode_table
 
 HOSTCFLAGS_gen_facilities.o += -Wall $(LINUXINCLUDE)
 HOSTCFLAGS_gen_opcode_table.o += -Wall $(LINUXINCLUDE)
 
-define filechk_facilities.h
+# Ensure output directory exists
+_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
+
+define filechk_facility-defs.h
        $(obj)/gen_facilities
 endef
 
-define filechk_dis.h
+define filechk_dis-defs.h
        ( $(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt )
 endef
 
-include/generated/facilities.h: $(obj)/gen_facilities FORCE
-       $(call filechk,facilities.h)
+$(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE
+       $(call filechk,facility-defs.h)
 
-include/generated/dis.h: $(obj)/gen_opcode_table FORCE
-       $(call filechk,dis.h)
+$(kapi)/dis-defs.h: $(obj)/gen_opcode_table FORCE
+       $(call filechk,dis-defs.h)

diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 0373801d986019f980162ed6aa30895bd2707088..424a1ba4f874ad3f85f73322d5432d774fdf0498 100644 (file)
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -128,8 +128,8 @@ static void print_facility_lists(void)
 
 int main(int argc, char **argv)
 {
-       printf("#ifndef __ASM_S390_FACILITIES__\n");
-       printf("#define __ASM_S390_FACILITIES__\n");
+       printf("#ifndef __ASM_S390_FACILITY_DEFS__\n");
+       printf("#define __ASM_S390_FACILITY_DEFS__\n");
        printf("/*\n");
        printf(" * DO NOT MODIFY.\n");
        printf(" *\n");

diff --git a/arch/s390/tools/gen_opcode_table.c b/arch/s390/tools/gen_opcode_table.c
index 357d42681cefae0e8c7e40d500bdb5b452d9173e..259aa0680d1a748f1f78ffdcbc779042678bd0cb 100644 (file)
--- a/arch/s390/tools/gen_opcode_table.c
+++ b/arch/s390/tools/gen_opcode_table.c
@@ -321,8 +321,8 @@ int main(int argc, char **argv)
        struct gen_opcode *desc = &_desc;
 
        read_instructions(desc);
-       printf("#ifndef __S390_GENERATED_DIS_H__\n");
-       printf("#define __S390_GENERATED_DIS_H__\n");
+       printf("#ifndef __S390_GENERATED_DIS_DEFS_H__\n");
+       printf("#define __S390_GENERATED_DIS_DEFS_H__\n");
        printf("/*\n");
        printf(" * DO NOT MODIFY.\n");
        printf(" *\n");