Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers

__ASSEMBLY__ is only defined by the Makefile of the kernel, so
this is not really useful for uapi headers (unless the userspace
Makefile defines it, too). Let's switch to __ASSEMBLER__ which
gets set automatically by the compiler when compiling assembler
code.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20250611140046.137739-2-thuth@redhat.com
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

authored by

Thomas Huth and committed by
Alexander Gordeev
9b27182c e04c78d8

+7 -6
+3 -2
arch/s390/include/uapi/asm/ptrace.h
··· 242 242 #define PTRACE_OLDSETOPTIONS 21 243 243 #define PTRACE_SYSEMU 31 244 244 #define PTRACE_SYSEMU_SINGLESTEP 32 245 - #ifndef __ASSEMBLY__ 245 + 246 + #ifndef __ASSEMBLER__ 246 247 #include <linux/stddef.h> 247 248 #include <linux/types.h> 248 249 ··· 451 450 unsigned long ieee_instruction_pointer; /* obsolete, always 0 */ 452 451 }; 453 452 454 - #endif /* __ASSEMBLY__ */ 453 + #endif /* __ASSEMBLER__ */ 455 454 456 455 #endif /* _UAPI_S390_PTRACE_H */
+2 -2
arch/s390/include/uapi/asm/schid.h
··· 4 4 5 5 #include <linux/types.h> 6 6 7 - #ifndef __ASSEMBLY__ 7 + #ifndef __ASSEMBLER__ 8 8 9 9 struct subchannel_id { 10 10 __u32 cssid : 8; ··· 15 15 __u32 sch_no : 16; 16 16 } __attribute__ ((packed, aligned(4))); 17 17 18 - #endif /* __ASSEMBLY__ */ 18 + #endif /* __ASSEMBLER__ */ 19 19 20 20 #endif /* _UAPIASM_SCHID_H */
+2 -2
arch/s390/include/uapi/asm/types.h
··· 10 10 11 11 #include <asm-generic/int-ll64.h> 12 12 13 - #ifndef __ASSEMBLY__ 13 + #ifndef __ASSEMBLER__ 14 14 15 15 typedef unsigned long addr_t; 16 16 typedef __signed__ long saddr_t; ··· 25 25 }; 26 26 } __attribute__((packed, aligned(4))) __vector128; 27 27 28 - #endif /* __ASSEMBLY__ */ 28 + #endif /* __ASSEMBLER__ */ 29 29 30 30 #endif /* _UAPI_S390_TYPES_H */