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

xtensa: 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 assembly
code.

This is a completely mechanical patch (done with a simple "sed -i"
statement).

Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20250314071013.1575167-39-thuth@redhat.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>

authored by

Thomas Huth and committed by
Max Filippov
da787016 0ff41df1

+6 -6
+1 -1
arch/xtensa/include/uapi/asm/ptrace.h
··· 42 42 #define PTRACE_GETFDPIC_EXEC 0 43 43 #define PTRACE_GETFDPIC_INTERP 1 44 44 45 - #ifndef __ASSEMBLY__ 45 + #ifndef __ASSEMBLER__ 46 46 47 47 struct user_pt_regs { 48 48 __u32 pc;
+3 -3
arch/xtensa/include/uapi/asm/signal.h
··· 19 19 #define _NSIG_BPW 32 20 20 #define _NSIG_WORDS (_NSIG / _NSIG_BPW) 21 21 22 - #ifndef __ASSEMBLY__ 22 + #ifndef __ASSEMBLER__ 23 23 24 24 #include <linux/types.h> 25 25 ··· 77 77 #define MINSIGSTKSZ 2048 78 78 #define SIGSTKSZ 8192 79 79 80 - #ifndef __ASSEMBLY__ 80 + #ifndef __ASSEMBLER__ 81 81 82 82 #include <asm-generic/signal-defs.h> 83 83 ··· 106 106 __kernel_size_t ss_size; 107 107 } stack_t; 108 108 109 - #endif /* __ASSEMBLY__ */ 109 + #endif /* __ASSEMBLER__ */ 110 110 #endif /* _UAPI_XTENSA_SIGNAL_H */
+2 -2
arch/xtensa/include/uapi/asm/types.h
··· 14 14 15 15 #include <asm-generic/int-ll64.h> 16 16 17 - #ifdef __ASSEMBLY__ 17 + #ifdef __ASSEMBLER__ 18 18 # define __XTENSA_UL(x) (x) 19 19 # define __XTENSA_UL_CONST(x) x 20 20 #else ··· 23 23 # define __XTENSA_UL_CONST(x) ___XTENSA_UL_CONST(x) 24 24 #endif 25 25 26 - #ifndef __ASSEMBLY__ 26 + #ifndef __ASSEMBLER__ 27 27 28 28 #endif 29 29