Commit 117c537c authored by Thomas Huth's avatar Thomas Huth Committed by Guo Ren (Alibaba DAMO Academy)
Browse files

csky: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi 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, or when dealing with uapi headers that
rather should use __ASSEMBLER__ instead. 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).

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarGuo Ren (Alibaba DAMO Academy) <guoren@kernel.org>
parent 809ef03d

arch/csky/abiv1/inc/abi/regdef.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#ifndef __ASM_CSKY_REGDEF_H

#define __ASM_CSKY_REGDEF_H



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

#define syscallid	r1

#else

#define syscallid	"r1"

arch/csky/abiv2/inc/abi/regdef.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#ifndef __ASM_CSKY_REGDEF_H

#define __ASM_CSKY_REGDEF_H



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

#define syscallid	r7

#else

#define syscallid	"r7"

arch/csky/include/asm/barrier.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#ifndef __ASM_CSKY_BARRIER_H

#define __ASM_CSKY_BARRIER_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define nop()	asm volatile ("nop\n":::"memory")
@@ -84,5 +84,5 @@ 


#include <asm-generic/barrier.h>



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* __ASM_CSKY_BARRIER_H */

arch/csky/include/asm/cache.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



void dcache_wb_line(unsigned long start);

arch/csky/include/asm/ftrace.h

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


#define MCOUNT_ADDR	((unsigned long)_mcount)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



extern void _mcount(unsigned long);
@@ -28,5 +28,5 @@ struct dyn_arch_ftrace { 
void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,

			   unsigned long frame_pointer);



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */

#endif /* __ASM_CSKY_FTRACE_H */