[xen master] tools/symbols: drop asm/types.h inclusion

[patchbot@xxxxxxx]

commit d476bba90c3e35fd28ec787b32826cf1d5134ba1
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Feb 6 16:03:00 2023 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Feb 6 16:03:00 2023 +0100

    tools/symbols: drop asm/types.h inclusion
    
    While this has been there forever, it's not clear to me what it was
    (thought to be) needed for. In fact, all three instances of the header
    already exclude their entire bodies when __ASSEMBLY__ was defined.
    Hence, with no other assembly files including this header, we can at the
    same time get rid of those conditionals.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
    Reviewed-by: Alistair Francis <alistair.francis@xxxxxxx>
---
 xen/arch/arm/include/asm/types.h   | 5 -----
 xen/arch/riscv/include/asm/types.h | 4 ----
 xen/arch/x86/include/asm/types.h   | 4 ----
 xen/tools/symbols.c                | 1 -
 4 files changed, 14 deletions(-)

diff --git a/xen/arch/arm/include/asm/types.h b/xen/arch/arm/include/asm/types.h
index 576e971fe1..e218ed77bd 100644
--- a/xen/arch/arm/include/asm/types.h
+++ b/xen/arch/arm/include/asm/types.h
@@ -1,9 +1,6 @@
 #ifndef __ARM_TYPES_H__
 #define __ARM_TYPES_H__
 
-#ifndef __ASSEMBLY__
-
-
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
@@ -54,8 +51,6 @@ typedef u64 register_t;
 #define PRIregister "016lx"
 #endif
 
-#endif /* __ASSEMBLY__ */
-
 #endif /* __ARM_TYPES_H__ */
 /*
  * Local variables:
diff --git a/xen/arch/riscv/include/asm/types.h 
b/xen/arch/riscv/include/asm/types.h
index 64976f118d..0c0ce78c8f 100644
--- a/xen/arch/riscv/include/asm/types.h
+++ b/xen/arch/riscv/include/asm/types.h
@@ -1,8 +1,6 @@
 #ifndef __RISCV_TYPES_H__
 #define __RISCV_TYPES_H__
 
-#ifndef __ASSEMBLY__
-
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
@@ -57,8 +55,6 @@ typedef u64 register_t;
 
 #endif
 
-#endif /* __ASSEMBLY__ */
-
 #endif /* __RISCV_TYPES_H__ */
 /*
  * Local variables:
diff --git a/xen/arch/x86/include/asm/types.h b/xen/arch/x86/include/asm/types.h
index 0e9cfdece8..2d56aed667 100644
--- a/xen/arch/x86/include/asm/types.h
+++ b/xen/arch/x86/include/asm/types.h
@@ -1,8 +1,6 @@
 #ifndef __X86_TYPES_H__
 #define __X86_TYPES_H__
 
-#ifndef __ASSEMBLY__
-
 typedef __signed__ char __s8;
 typedef unsigned char __u8;
 
@@ -32,6 +30,4 @@ typedef unsigned long paddr_t;
 #define INVALID_PADDR (~0UL)
 #define PRIpaddr "016lx"
 
-#endif /* __ASSEMBLY__ */
-
 #endif /* __X86_TYPES_H__ */
diff --git a/xen/tools/symbols.c b/xen/tools/symbols.c
index 710e9785d3..67560605f2 100644
--- a/xen/tools/symbols.c
+++ b/xen/tools/symbols.c
@@ -302,7 +302,6 @@ static void write_src(void)
                return;
        }
        printf("#include <xen/config.h>\n");
-       printf("#include <asm/types.h>\n");
        printf("#if BITS_PER_LONG == 64 && !defined(SYMBOLS_ORIGIN)\n");
        printf("#define PTR .quad\n");
        printf("#define ALGN .align 8\n");
--
generated by git-patchbot for /home/xen/git/xen.git#master