Commit da787016 authored by Thomas Huth's avatar Thomas Huth Committed by Max Filippov
Browse files

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: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20250314071013.1575167-39-thuth@redhat.com>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 0ff41df1

arch/xtensa/include/uapi/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define PTRACE_GETFDPIC_EXEC	0

#define PTRACE_GETFDPIC_INTERP	1



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct user_pt_regs {

	__u32 pc;

arch/xtensa/include/uapi/asm/signal.h

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define _NSIG_BPW	32

#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>
@@ -77,7 +77,7 @@ typedef struct { 
#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <asm-generic/signal-defs.h>
@@ -106,5 +106,5 @@ typedef struct sigaltstack { 
	__kernel_size_t ss_size;

} stack_t;



#endif	/* __ASSEMBLY__ */

#endif	/* __ASSEMBLER__ */

#endif /* _UAPI_XTENSA_SIGNAL_H */

arch/xtensa/include/uapi/asm/types.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <asm-generic/int-ll64.h>



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

# define __XTENSA_UL(x)		(x)

# define __XTENSA_UL_CONST(x)	x

#else
@@ -23,7 +23,7 @@ 
# define __XTENSA_UL_CONST(x)	___XTENSA_UL_CONST(x)

#endif



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#endif