Commit cccaea1d authored by Thomas Huth's avatar Thomas Huth Committed by Helge Deller
Browse files

parisc: 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 mostly a completely mechanical patch (done with a simple
"sed -i" statement), except for some manual tweaks in the files
arch/parisc/include/asm/smp.h, arch/parisc/include/asm/signal.h,
arch/parisc/include/asm/thread_info.h and arch/parisc/include/asm/vdso.h
that had the macro spelled in a wrong way.

Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent e2b6a188

arch/parisc/include/asm/alternative.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define INSN_PxTLB	0x02		/* modify pdtlb, pitlb */

#define INSN_NOP	0x08000240	/* nop */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#include <linux/init.h>

#include <linux/types.h>
@@ -61,6 +61,6 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 
	.word (new_instr_ptr - .)	!	\

	.previous



#endif  /*  __ASSEMBLY__  */

#endif  /*  __ASSEMBLER__  */



#endif /* __ASM_PARISC_ALTERNATIVE_H */

arch/parisc/include/asm/assembly.h

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define SR_TEMP2	2

#define SR_USER		3



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__



#ifdef CONFIG_64BIT

#define LDREG	ldd
@@ -582,5 +582,5 @@ 
	.previous





#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif

arch/parisc/include/asm/barrier.h

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


#include <asm/alternative.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/* The synchronize caches instruction executes as a nop on systems in

   which all memory references are performed in order. */
@@ -93,5 +93,5 @@ do { \ 
})

#include <asm-generic/barrier.h>



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */

#endif /* __ASM_BARRIER_H */

arch/parisc/include/asm/cache.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define L1_CACHE_BYTES 16

#define L1_CACHE_SHIFT 4



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define SMP_CACHE_BYTES L1_CACHE_BYTES
@@ -66,7 +66,7 @@ void parisc_setup_cache_timing(void); 
			ALTERNATIVE(ALT_COND_NO_IOC_FDC, INSN_NOP) :::"memory")

#define asm_syncdma()	asm volatile("syncdma" :::"memory")



#endif /* ! __ASSEMBLY__ */

#endif /* ! __ASSEMBLER__ */



/* Classes of processor wrt: disabling space register hashing */

arch/parisc/include/asm/current.h

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

#define _ASM_PARISC_CURRENT_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

struct task_struct;



static __always_inline struct task_struct *get_current(void)
@@ -16,6 +16,6 @@ static __always_inline struct task_struct *get_current(void) 


#define current get_current()



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* _ASM_PARISC_CURRENT_H */