Commit 69917dbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of https://github.com/openrisc/linux 

Pull OpenRISC updates from Stafford Horne:

 - Replace __ASSEMBLY__ with __ASSEMBLER__ in headers (Thomas Huth)

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
parents 8b45c6c9 f0eedcf2

arch/openrisc/include/asm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef __ASM_OPENRISC_MMU_H

#define __ASM_OPENRISC_MMU_H



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

typedef unsigned long mm_context_t;

#endif

arch/openrisc/include/asm/page.h

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 */

#include <asm/setup.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define clear_page(page)	memset((page), 0, PAGE_SIZE)

#define copy_page(to, from)	memcpy((to), (from), PAGE_SIZE)
@@ -55,10 +55,10 @@ typedef struct page *pgtable_t; 
#define __pgd(x)	((pgd_t) { (x) })

#define __pgprot(x)	((pgprot_t) { (x) })



#endif /* !__ASSEMBLY__ */

#endif /* !__ASSEMBLER__ */





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET))

#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
@@ -73,7 +73,7 @@ static inline unsigned long virt_to_pfn(const void *kaddr) 


#define virt_addr_valid(kaddr)	(pfn_valid(virt_to_pfn(kaddr)))



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



#include <asm-generic/memory_model.h>

#include <asm-generic/getorder.h>

arch/openrisc/include/asm/pgtable.h

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


#include <asm-generic/pgtable-nopmd.h>



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

#include <asm/mmu.h>

#include <asm/fixmap.h>
@@ -430,5 +430,5 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) 


typedef pte_t *pte_addr_t;



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* __ASM_OPENRISC_PGTABLE_H */

arch/openrisc/include/asm/processor.h

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

#define TASK_UNMAPPED_BASE      (TASK_SIZE / 8 * 3)



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



struct task_struct;
@@ -78,5 +78,5 @@ void show_registers(struct pt_regs *regs); 


#define cpu_relax()     barrier()



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */

#endif /* __ASM_OPENRISC_PROCESSOR_H */

arch/openrisc/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * they share a cacheline (not done yet, though... future optimization).

 */



#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__

/*

 * This struct describes how the registers are laid out on the kernel stack

 * during a syscall or other kernel entry.
@@ -147,7 +147,7 @@ static inline unsigned long regs_get_register(struct pt_regs *regs, 
	return *(unsigned long *)((unsigned long)regs + offset);

}



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLER__ */



/*

 * Offsets used by 'ptrace' system call interface.