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

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>

authored by

Thomas Huth and committed by
Andreas Larsson
d6fb6511 dc356bf3

+18 -18
+12 -12
arch/sparc/include/uapi/asm/ptrace.h
··· 15 15 */ 16 16 #define PT_REGS_MAGIC 0x57ac6c00 17 17 18 - #ifndef __ASSEMBLY__ 18 + #ifndef __ASSEMBLER__ 19 19 20 20 #include <linux/types.h> 21 21 ··· 88 88 unsigned long _unused; 89 89 struct pt_regs *regs; 90 90 }; 91 - #endif /* (!__ASSEMBLY__) */ 91 + #endif /* (!__ASSEMBLER__) */ 92 92 #else 93 93 /* 32 bit sparc */ 94 94 ··· 97 97 /* This struct defines the way the registers are stored on the 98 98 * stack during a system call and basically all traps. 99 99 */ 100 - #ifndef __ASSEMBLY__ 100 + #ifndef __ASSEMBLER__ 101 101 102 102 #include <linux/types.h> 103 103 ··· 125 125 unsigned long xargs[6]; 126 126 unsigned long xxargs[1]; 127 127 }; 128 - #endif /* (!__ASSEMBLY__) */ 128 + #endif /* (!__ASSEMBLER__) */ 129 129 130 130 #endif /* (defined(__sparc__) && defined(__arch64__))*/ 131 131 132 - #ifndef __ASSEMBLY__ 132 + #ifndef __ASSEMBLER__ 133 133 134 134 #define TRACEREG_SZ sizeof(struct pt_regs) 135 135 #define STACKFRAME_SZ sizeof(struct sparc_stackf) ··· 137 137 #define TRACEREG32_SZ sizeof(struct pt_regs32) 138 138 #define STACKFRAME32_SZ sizeof(struct sparc_stackf32) 139 139 140 - #endif /* (!__ASSEMBLY__) */ 140 + #endif /* (!__ASSEMBLER__) */ 141 141 142 142 #define UREG_G0 0 143 143 #define UREG_G1 1 ··· 161 161 #if defined(__sparc__) && defined(__arch64__) 162 162 /* 64 bit sparc */ 163 163 164 - #ifndef __ASSEMBLY__ 164 + #ifndef __ASSEMBLER__ 165 165 166 166 167 - #else /* __ASSEMBLY__ */ 167 + #else /* __ASSEMBLER__ */ 168 168 /* For assembly code. */ 169 169 #define TRACEREG_SZ 0xa0 170 170 #define STACKFRAME_SZ 0xc0 171 171 172 172 #define TRACEREG32_SZ 0x50 173 173 #define STACKFRAME32_SZ 0x60 174 - #endif /* __ASSEMBLY__ */ 174 + #endif /* __ASSEMBLER__ */ 175 175 176 176 #else /* (defined(__sparc__) && defined(__arch64__)) */ 177 177 178 178 /* 32 bit sparc */ 179 179 180 - #ifndef __ASSEMBLY__ 180 + #ifndef __ASSEMBLER__ 181 181 182 182 183 - #else /* (!__ASSEMBLY__) */ 183 + #else /* (!__ASSEMBLER__) */ 184 184 /* For assembly code. */ 185 185 #define TRACEREG_SZ 0x50 186 186 #define STACKFRAME_SZ 0x60 187 - #endif /* (!__ASSEMBLY__) */ 187 + #endif /* (!__ASSEMBLER__) */ 188 188 189 189 #endif /* (defined(__sparc__) && defined(__arch64__)) */ 190 190
+2 -2
arch/sparc/include/uapi/asm/signal.h
··· 105 105 #define __old_sigaction32 sigaction32 106 106 #endif 107 107 108 - #ifndef __ASSEMBLY__ 108 + #ifndef __ASSEMBLER__ 109 109 110 110 typedef unsigned long __old_sigset_t; /* at least 32 bits */ 111 111 ··· 176 176 } stack_t; 177 177 178 178 179 - #endif /* !(__ASSEMBLY__) */ 179 + #endif /* !(__ASSEMBLER__) */ 180 180 181 181 #endif /* _UAPI__SPARC_SIGNAL_H */
+2 -2
arch/sparc/include/uapi/asm/traps.h
··· 10 10 11 11 #define NUM_SPARC_TRAPS 255 12 12 13 - #ifndef __ASSEMBLY__ 14 - #endif /* !(__ASSEMBLY__) */ 13 + #ifndef __ASSEMBLER__ 14 + #endif /* !(__ASSEMBLER__) */ 15 15 16 16 /* For patching the trap table at boot time, we need to know how to 17 17 * form various common Sparc instructions. Thus these macros...
+2 -2
arch/sparc/include/uapi/asm/utrap.h
··· 44 44 45 45 #define UTH_NOCHANGE (-1) 46 46 47 - #ifndef __ASSEMBLY__ 47 + #ifndef __ASSEMBLER__ 48 48 typedef int utrap_entry_t; 49 49 typedef void *utrap_handler_t; 50 - #endif /* __ASSEMBLY__ */ 50 + #endif /* __ASSEMBLER__ */ 51 51 52 52 #endif /* !(__ASM_SPARC64_PROCESSOR_H) */