Commit 35ebe003 authored by Thomas Huth's avatar Thomas Huth Committed by Paul Walmsley
Browse files

riscv: 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: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: linux-riscv@lists.infradead.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Link: https://lore.kernel.org/r/20250606070952.498274-2-thuth@redhat.com


Signed-off-by: default avatarPaul Walmsley <pjw@kernel.org>
parent 3a8ee3a9

arch/riscv/include/uapi/asm/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#ifndef __LINUX_KVM_RISCV_H

#define __LINUX_KVM_RISCV_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>

#include <asm/bitsperlong.h>

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

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef _UAPI_ASM_RISCV_PTRACE_H

#define _UAPI_ASM_RISCV_PTRACE_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>
@@ -127,6 +127,6 @@ struct __riscv_v_regset_state { 
 */

#define RISCV_MAX_VLENB (8192)



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* _UAPI_ASM_RISCV_PTRACE_H */

arch/riscv/include/uapi/asm/sigcontext.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
/* The size of END signal context header. */

#define END_HDR_SIZE	0x0



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct __sc_riscv_v_state {

	struct __riscv_v_ext_state v_state;
@@ -35,6 +35,6 @@ struct sigcontext { 
	};

};



#endif /*!__ASSEMBLY__*/

#endif /*!__ASSEMBLER__*/



#endif /* _UAPI_ASM_RISCV_SIGCONTEXT_H */