Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sparc: 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: David S. Miller <davem@davemloft.net>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
This commit is contained in:
Thomas Huth 2025-03-14 08:10:04 +01:00 committed by Andreas Larsson
parent dc356bf3c1
commit d6fb6511de
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/sparc/include/uapi/asm/ptrace.h
View File

@ -15,7 +15,7 @@
*/ */
#define PT_REGS_MAGIC 0x57ac6c00 #define PT_REGS_MAGIC 0x57ac6c00
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@ -88,7 +88,7 @@ struct sparc_trapf {
unsigned long _unused; unsigned long _unused;
struct pt_regs *regs; struct pt_regs *regs;
}; };
#endif /* (!__ASSEMBLY__) */ #endif /* (!__ASSEMBLER__) */
#else #else
/* 32 bit sparc */ /* 32 bit sparc */
@ -97,7 +97,7 @@ struct sparc_trapf {
/* This struct defines the way the registers are stored on the /* This struct defines the way the registers are stored on the
* stack during a system call and basically all traps. * stack during a system call and basically all traps.
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#include <linux/types.h> #include <linux/types.h>
@ -125,11 +125,11 @@ struct sparc_stackf {
unsigned long xargs[6]; unsigned long xargs[6];
unsigned long xxargs[1]; unsigned long xxargs[1];
}; };
#endif /* (!__ASSEMBLY__) */ #endif /* (!__ASSEMBLER__) */
#endif /* (defined(__sparc__) && defined(__arch64__))*/ #endif /* (defined(__sparc__) && defined(__arch64__))*/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#define TRACEREG_SZ sizeof(struct pt_regs) #define TRACEREG_SZ sizeof(struct pt_regs)
#define STACKFRAME_SZ sizeof(struct sparc_stackf) #define STACKFRAME_SZ sizeof(struct sparc_stackf)
@ -137,7 +137,7 @@ struct sparc_stackf {
#define TRACEREG32_SZ sizeof(struct pt_regs32) #define TRACEREG32_SZ sizeof(struct pt_regs32)
#define STACKFRAME32_SZ sizeof(struct sparc_stackf32) #define STACKFRAME32_SZ sizeof(struct sparc_stackf32)
#endif /* (!__ASSEMBLY__) */ #endif /* (!__ASSEMBLER__) */
#define UREG_G0 0 #define UREG_G0 0
#define UREG_G1 1 #define UREG_G1 1
@ -161,30 +161,30 @@ struct sparc_stackf {
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
/* 64 bit sparc */ /* 64 bit sparc */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#else /* __ASSEMBLY__ */ #else /* __ASSEMBLER__ */
/* For assembly code. */ /* For assembly code. */
#define TRACEREG_SZ 0xa0 #define TRACEREG_SZ 0xa0
#define STACKFRAME_SZ 0xc0 #define STACKFRAME_SZ 0xc0
#define TRACEREG32_SZ 0x50 #define TRACEREG32_SZ 0x50
#define STACKFRAME32_SZ 0x60 #define STACKFRAME32_SZ 0x60
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#else /* (defined(__sparc__) && defined(__arch64__)) */ #else /* (defined(__sparc__) && defined(__arch64__)) */
/* 32 bit sparc */ /* 32 bit sparc */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#else /* (!__ASSEMBLY__) */ #else /* (!__ASSEMBLER__) */
/* For assembly code. */ /* For assembly code. */
#define TRACEREG_SZ 0x50 #define TRACEREG_SZ 0x50
#define STACKFRAME_SZ 0x60 #define STACKFRAME_SZ 0x60
#endif /* (!__ASSEMBLY__) */ #endif /* (!__ASSEMBLER__) */
#endif /* (defined(__sparc__) && defined(__arch64__)) */ #endif /* (defined(__sparc__) && defined(__arch64__)) */

4
arch/sparc/include/uapi/asm/signal.h
View File

@ -105,7 +105,7 @@
#define __old_sigaction32 sigaction32 #define __old_sigaction32 sigaction32
#endif #endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
typedef unsigned long __old_sigset_t; /* at least 32 bits */ typedef unsigned long __old_sigset_t; /* at least 32 bits */
@ -176,6 +176,6 @@ typedef struct sigaltstack {
} stack_t; } stack_t;
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLER__) */
#endif /* _UAPI__SPARC_SIGNAL_H */ #endif /* _UAPI__SPARC_SIGNAL_H */

4
arch/sparc/include/uapi/asm/traps.h
View File

@ -10,8 +10,8 @@
#define NUM_SPARC_TRAPS 255 #define NUM_SPARC_TRAPS 255
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLER__) */
/* For patching the trap table at boot time, we need to know how to /* For patching the trap table at boot time, we need to know how to
* form various common Sparc instructions. Thus these macros... * form various common Sparc instructions. Thus these macros...

4
arch/sparc/include/uapi/asm/utrap.h
View File

@ -44,9 +44,9 @@
#define UTH_NOCHANGE (-1) #define UTH_NOCHANGE (-1)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLER__
typedef int utrap_entry_t; typedef int utrap_entry_t;
typedef void *utrap_handler_t; typedef void *utrap_handler_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLER__ */
#endif /* !(__ASM_SPARC64_PROCESSOR_H) */ #endif /* !(__ASM_SPARC64_PROCESSOR_H) */