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

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

Pull microblaze updates from Michal Simek:

 - Export xmb_manager functions

 - Remove empty #ifndef __ASSEMBLY__ statement

 - Use str_yes_no() helper in show_cpuinfo()

* tag 'microblaze-v6.13' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: mb: Use str_yes_no() helper in show_cpuinfo()
  microblaze: Remove empty #ifndef __ASSEMBLY__ statement
  microblaze: Export xmb_manager functions
parents 7e7f6564 eb01f8f3

arch/microblaze/include/uapi/asm/setup.h

+0 −3
Original line number Diff line number Diff line
@@ -14,7 +14,4 @@ 


#define COMMAND_LINE_SIZE	256



# ifndef __ASSEMBLY__



# endif /* __ASSEMBLY__ */

#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */

arch/microblaze/kernel/cpu/mb.c

+5 −5
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) 
		   " MSR:\t\t%s\n"

		   " PCMP:\t\t%s\n"

		   " DIV:\t\t%s\n",

		   (cpuinfo.use_instr & PVR0_USE_BARREL_MASK) ? "yes" : "no",

		   (cpuinfo.use_instr & PVR2_USE_MSR_INSTR) ? "yes" : "no",

		   (cpuinfo.use_instr & PVR2_USE_PCMP_INSTR) ? "yes" : "no",

		   (cpuinfo.use_instr & PVR0_USE_DIV_MASK) ? "yes" : "no");

		   str_yes_no(cpuinfo.use_instr & PVR0_USE_BARREL_MASK),

		   str_yes_no(cpuinfo.use_instr & PVR2_USE_MSR_INSTR),

		   str_yes_no(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR),

		   str_yes_no(cpuinfo.use_instr & PVR0_USE_DIV_MASK));



	seq_printf(m, " MMU:\t\t%x\n", cpuinfo.mmu);
@@ -120,7 +120,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 


	seq_printf(m,

		   "HW-Debug:\t%s\n",

		   cpuinfo.hw_debug ? "yes" : "no");

		   str_yes_no(cpuinfo.hw_debug));



	seq_printf(m,

		   "PVR-USR1:\t%02x\n"

arch/microblaze/kernel/microblaze_ksyms.c

+10 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/page.h>

#include <linux/ftrace.h>

#include <linux/uaccess.h>

#include <asm/xilinx_mb_manager.h>



#ifdef CONFIG_FUNCTION_TRACER

extern void _mcount(void);
@@ -46,3 +47,12 @@ extern void __udivsi3(void); 
EXPORT_SYMBOL(__udivsi3);

extern void __umodsi3(void);

EXPORT_SYMBOL(__umodsi3);



#ifdef CONFIG_MB_MANAGER

extern void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val,

				 void (*callback)(void *data),

				 void *priv, void (*reset_callback)(void *data));

EXPORT_SYMBOL(xmb_manager_register);

extern asmlinkage void xmb_inject_err(void);

EXPORT_SYMBOL(xmb_inject_err);

#endif