Commit e6d8afd2 authored by Thomas Huth's avatar Thomas Huth Committed by Dinh Nguyen
Browse files

nios2: 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).

Cc: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
parent 331b05b1

arch/nios2/include/asm/entry.h

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

#define _ASM_NIOS2_ENTRY_H



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__



#include <asm/processor.h>

#include <asm/registers.h>
@@ -117,5 +117,5 @@ 
	addi	sp, sp, SWITCH_STACK_SIZE

.endm



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* _ASM_NIOS2_ENTRY_H */

arch/nios2/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define PAGE_OFFSET	\

	(CONFIG_NIOS2_MEM_BASE + CONFIG_NIOS2_KERNEL_REGION_BASE)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/*

 * This gives the physical RAM offset.
@@ -90,6 +90,6 @@ extern struct page *mem_map; 


#include <asm-generic/getorder.h>



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */



#endif /* _ASM_NIOS2_PAGE_H */

arch/nios2/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
/* Kuser helpers is mapped to this user space address */

#define KUSER_BASE		0x1000

#define KUSER_SIZE		(PAGE_SIZE)

#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



# define TASK_SIZE		0x7FFF0000UL

# define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
@@ -72,6 +72,6 @@ extern unsigned long __get_wchan(struct task_struct *p); 


#define cpu_relax()	barrier()



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#endif /* _ASM_NIOS2_PROCESSOR_H */

arch/nios2/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
/* This struct defines the way the registers are stored on the

   stack during a system call.  */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

struct pt_regs {

	unsigned long  r8;	/* r8-r15 Caller-saved GP registers */

	unsigned long  r9;
@@ -78,5 +78,5 @@ extern void show_regs(struct pt_regs *); 


int do_syscall_trace_enter(void);

void do_syscall_trace_exit(void);

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* _ASM_NIOS2_PTRACE_H */

arch/nios2/include/asm/registers.h

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

#define _ASM_NIOS2_REGISTERS_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

#include <asm/cpuinfo.h>

#endif
@@ -44,7 +44,7 @@ 


/* tlbmisc register bits */

#define TLBMISC_PID_SHIFT	4

#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

#define TLBMISC_PID_MASK	((1UL << cpuinfo.tlb_pid_num_bits) - 1)

#endif

#define TLBMISC_WAY_MASK	0xf