Commit 179e9497 authored by Thomas Huth's avatar Thomas Huth Committed by Vineet Gupta
Browse files

ARC: Replace __ASSEMBLY__ with __ASSEMBLER__ in the 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).

Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarVineet Gupta <vgupta@kernel.org>
parent 2cb74be3

arch/arc/include/asm/arcregs.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ 
#define ARC_AUX_AGU_MOD2	0x5E2

#define ARC_AUX_AGU_MOD3	0x5E3



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <soc/arc/arc_aux.h>

arch/arc/include/asm/atomic.h

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

#define _ASM_ARC_ATOMIC_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>

#include <linux/compiler.h>
@@ -31,6 +31,6 @@ 
#include <asm/atomic64-arcv2.h>

#endif



#endif	/* !__ASSEMBLY__ */

#endif	/* !__ASSEMBLER__ */



#endif

arch/arc/include/asm/bitops.h

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#error only <linux/bitops.h> can be included directly

#endif



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/types.h>

#include <linux/compiler.h>
@@ -192,6 +192,6 @@ static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x) 
#include <asm-generic/bitops/le.h>

#include <asm-generic/bitops/ext2-atomic-setbit.h>



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#endif

arch/arc/include/asm/bug.h

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

#define _ASM_ARC_BUG_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <asm/ptrace.h>
@@ -29,6 +29,6 @@ void die(const char *str, struct pt_regs *regs, unsigned long address); 


#include <asm-generic/bug.h>



#endif	/* !__ASSEMBLY__ */

#endif	/* !__ASSEMBLER__ */



#endif

arch/arc/include/asm/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */

#define ARC_UNCACHED_ADDR_SPACE	0xc0000000



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/build_bug.h>
@@ -65,7 +65,7 @@ 
extern int ioc_enable;

extern unsigned long perip_base, perip_end;



#endif	/* !__ASSEMBLY__ */

#endif	/* !__ASSEMBLER__ */



/* Instruction cache related Auxiliary registers */

#define ARC_REG_IC_BCR		0x77	/* Build Config reg */