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

Configure Feed

Select the types of activity you want to include in your feed.

powerpc: 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.

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

Acked-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20250801082007.32904-2-thuth@redhat.com

authored by

Thomas Huth and committed by
Madhavan Srinivasan 8e0665eb b320789d

+10 -10
+2 -2
arch/powerpc/include/uapi/asm/opal-prd.h
··· 40 40 #define OPAL_PRD_SCOM_READ _IOR('o', 0x02, struct opal_prd_scom) 41 41 #define OPAL_PRD_SCOM_WRITE _IOW('o', 0x03, struct opal_prd_scom) 42 42 43 - #ifndef __ASSEMBLY__ 43 + #ifndef __ASSEMBLER__ 44 44 45 45 struct opal_prd_info { 46 46 __u64 version; ··· 54 54 __s64 rc; 55 55 }; 56 56 57 - #endif /* __ASSEMBLY__ */ 57 + #endif /* __ASSEMBLER__ */ 58 58 59 59 #endif /* _UAPI_ASM_POWERPC_OPAL_PRD_H */
+6 -6
arch/powerpc/include/uapi/asm/ptrace.h
··· 27 27 28 28 #include <linux/types.h> 29 29 30 - #ifndef __ASSEMBLY__ 30 + #ifndef __ASSEMBLER__ 31 31 32 32 #ifdef __KERNEL__ 33 33 struct user_pt_regs ··· 57 57 unsigned long result; /* Result of a system call */ 58 58 }; 59 59 60 - #endif /* __ASSEMBLY__ */ 60 + #endif /* __ASSEMBLER__ */ 61 61 62 62 63 63 /* ··· 200 200 #define PPC_PTRACE_SETHWDEBUG 0x88 201 201 #define PPC_PTRACE_DELHWDEBUG 0x87 202 202 203 - #ifndef __ASSEMBLY__ 203 + #ifndef __ASSEMBLER__ 204 204 205 205 struct ppc_debug_info { 206 206 __u32 version; /* Only version 1 exists to date */ ··· 212 212 __u64 features; 213 213 }; 214 214 215 - #endif /* __ASSEMBLY__ */ 215 + #endif /* __ASSEMBLER__ */ 216 216 217 217 /* 218 218 * features will have bits indication whether there is support for: ··· 224 224 #define PPC_DEBUG_FEATURE_DATA_BP_DAWR 0x0000000000000010 225 225 #define PPC_DEBUG_FEATURE_DATA_BP_ARCH_31 0x0000000000000020 226 226 227 - #ifndef __ASSEMBLY__ 227 + #ifndef __ASSEMBLER__ 228 228 229 229 struct ppc_hw_breakpoint { 230 230 __u32 version; /* currently, version must be 1 */ ··· 236 236 __u64 condition_value; /* contents of the DVC register */ 237 237 }; 238 238 239 - #endif /* __ASSEMBLY__ */ 239 + #endif /* __ASSEMBLER__ */ 240 240 241 241 /* 242 242 * Trigger Type
+2 -2
arch/powerpc/include/uapi/asm/types.h
··· 28 28 # include <asm-generic/int-ll64.h> 29 29 #endif 30 30 31 - #ifndef __ASSEMBLY__ 31 + #ifndef __ASSEMBLER__ 32 32 33 33 34 34 typedef struct { 35 35 __u32 u[4]; 36 36 } __attribute__((aligned(16))) __vector128; 37 37 38 - #endif /* __ASSEMBLY__ */ 38 + #endif /* __ASSEMBLER__ */ 39 39 40 40 41 41 #endif /* _UAPI_ASM_POWERPC_TYPES_H */