diff options
author | Hendrik Brueckner | 2018-01-11 12:13:18 +0100 |
---|---|---|
committer | Martin Schwidefsky | 2018-01-23 07:36:53 +0100 |
commit | 7fbf8315fb7fc7321919e6c880d70077aded515e (patch) | |
tree | e8eeb46eee936c49fd64580f18b27eb039ea390d /arch/s390/include | |
parent | 4381f9f12e79436f90b14f326817cb1ed978940d (diff) |
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>
Diffstat (limited to 'arch/s390/include')
-rw-r--r-- | arch/s390/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/s390/include/asm/dis.h | 2 | ||||
-rw-r--r-- | arch/s390/include/asm/facility.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index 7b059510bed3..c7afbac38761 100644 --- 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 b0480c60a8e1..c18ed6091914 100644 --- 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 f040644575b7..fbe0c4be3cd8 100644 --- 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> |