Commit fc9ed2f6 authored by Thomas Huth's avatar Thomas Huth Committed by Johannes Berg
Browse files

um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers 



While the GCC and Clang compilers already define __ASSEMBLER__
automatically when compiling assembly code, __ASSEMBLY__ is a
macro that only gets defined by the Makefiles in the kernel.
This can be very confusing when switching between userspace
and kernelspace coding, so let's standardize on the __ASSEMBLER__
macro that is provided by the compilers now.

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

Cc: Richard Weinberger <richard@nod.at>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-um@lists.infradead.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Link: https://patch.msgid.link/20250314071013.1575167-36-thuth@redhat.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f7e9077a

arch/um/include/asm/cpufeature.h

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


#include <asm/processor.h>



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)

#if defined(__KERNEL__) && !defined(__ASSEMBLER__)



#include <asm/asm.h>

#include <linux/bitops.h>
@@ -137,5 +137,5 @@ static __always_inline bool _static_cpu_has(u16 bit) 
#define CPU_FEATURE_TYPEVAL		boot_cpu_data.x86_vendor, boot_cpu_data.x86, \

					boot_cpu_data.x86_model



#endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */

#endif /* defined(__KERNEL__) && !defined(__ASSEMBLER__) */

#endif /* _ASM_UM_CPUFEATURE_H */

arch/um/include/asm/current.h

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/compiler.h>

#include <linux/threads.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct task_struct;

extern struct task_struct *cpu_tasks[NR_CPUS];
@@ -18,6 +18,6 @@ static __always_inline struct task_struct *get_current(void) 


#define current get_current()



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* __ASM_CURRENT_H */

arch/um/include/asm/page.h

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


#include <vdso/page.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct page;
@@ -94,7 +94,7 @@ extern unsigned long uml_physmem; 
#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.h>



#endif	/* __ASSEMBLY__ */

#endif	/* __ASSEMBLER__ */



#ifdef CONFIG_X86_32

#define __HAVE_ARCH_GATE_AREA 1

arch/um/include/asm/ptrace-generic.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __UM_PTRACE_GENERIC_H

#define __UM_PTRACE_GENERIC_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <sysdep/ptrace.h>

arch/um/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define THREAD_SIZE_ORDER CONFIG_KERNEL_STACK_ORDER

#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <asm/types.h>

#include <asm/page.h>