Commit fe68bb28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v6.18' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:

 - Fix typos in Kconfig

 - s/__ASSEMBLY__/__ASSEMBLER__/g

* tag 'microblaze-v6.18' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
  microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
  microblaze: fix typos in Kconfig
parents 46a1b6b2 438f7cd4

arch/microblaze/Kconfig.platform

+5 −5
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 
menu "Platform options"



config OPT_LIB_FUNCTION

	bool "Optimalized lib function"

	bool "Optimized lib function"

	default y

	help

	  Allows turn on optimalized library function (memcpy and memmove).

	  Turns on optimized library functions (memcpy and memmove).

	  They are optimized by using word alignment. This will work

	  fine if both source and destination are aligned on the same

	  boundary. However, if they are aligned on different boundaries
@@ -19,13 +19,13 @@ config OPT_LIB_FUNCTION 
	  on MicroBlaze systems without a barrel shifter.



config OPT_LIB_ASM

	bool "Optimalized lib function ASM"

	bool "Optimized lib function ASM"

	depends on OPT_LIB_FUNCTION && (XILINX_MICROBLAZE0_USE_BARREL = 1)

	depends on CPU_BIG_ENDIAN

	default n

	help

	  Allows turn on optimalized library function (memcpy and memmove).

	  Function are written in asm code.

	  Turns on optimized library functions (memcpy and memmove).

	  They are written in assembly.



# Definitions for MICROBLAZE0

comment "Definitions for MICROBLAZE0"

arch/microblaze/include/asm/asm-compat.h

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


#include <asm/types.h>



#ifdef __ASSEMBLY__

#ifdef __ASSEMBLER__

#  define stringify_in_c(...)	__VA_ARGS__

#  define ASM_CONST(x)		x

#else

arch/microblaze/include/asm/current.h

+2 −2
Original line number Diff line number Diff line
@@ -14,13 +14,13 @@ 
 * but check asm/microblaze/kernel/entry.S to be sure.

 */

#define CURRENT_TASK	r31

# ifndef __ASSEMBLY__

# ifndef __ASSEMBLER__

/*

 * Dedicate r31 to keeping the current task pointer

 */

register struct task_struct *current asm("r31");



# define get_current()	current

# endif /* __ASSEMBLY__ */

# endif /* __ASSEMBLER__ */



#endif /* _ASM_MICROBLAZE_CURRENT_H */

arch/microblaze/include/asm/entry.h

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


#define PER_CPU(var) var



# ifndef __ASSEMBLY__

# ifndef __ASSEMBLER__

DECLARE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */

DECLARE_PER_CPU(unsigned int, KM); /* Kernel/user mode */

DECLARE_PER_CPU(unsigned int, ENTRY_SP); /* Saved SP on kernel entry */
@@ -29,6 +29,6 @@ DECLARE_PER_CPU(unsigned int, R11_SAVE); /* Temp variable for entry */ 
DECLARE_PER_CPU(unsigned int, CURRENT_SAVE); /* Saved current pointer */



extern asmlinkage void do_notify_resume(struct pt_regs *regs, int in_syscall);

# endif /* __ASSEMBLY__ */

# endif /* __ASSEMBLER__ */



#endif /* _ASM_MICROBLAZE_ENTRY_H */

arch/microblaze/include/asm/exceptions.h

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



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

#ifndef __ASSEMBLER__



/* Macros to enable and disable HW exceptions in the MSR */

/* Define MSR enable bit for HW exceptions */
@@ -64,6 +64,6 @@ void bad_page_fault(struct pt_regs *regs, unsigned long address, int sig); 
void die(const char *str, struct pt_regs *fp, long err);

void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);



#endif /*__ASSEMBLY__ */

#endif /*__ASSEMBLER__ */

#endif /* __KERNEL__ */

#endif /* _ASM_MICROBLAZE_EXCEPTIONS_H */