tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f1037497 7e7f6564

+15 -8
-3
arch/microblaze/include/uapi/asm/setup.h
··· 14 14 15 15 #define COMMAND_LINE_SIZE 256 16 16 17 - # ifndef __ASSEMBLY__ 18 - 19 - # endif /* __ASSEMBLY__ */ 20 17 #endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */
+5 -5
arch/microblaze/kernel/cpu/mb.c
··· 66 66 " MSR:\t\t%s\n" 67 67 " PCMP:\t\t%s\n" 68 68 " DIV:\t\t%s\n", 69 - (cpuinfo.use_instr & PVR0_USE_BARREL_MASK) ? "yes" : "no", 70 - (cpuinfo.use_instr & PVR2_USE_MSR_INSTR) ? "yes" : "no", 71 - (cpuinfo.use_instr & PVR2_USE_PCMP_INSTR) ? "yes" : "no", 72 - (cpuinfo.use_instr & PVR0_USE_DIV_MASK) ? "yes" : "no"); 69 + str_yes_no(cpuinfo.use_instr & PVR0_USE_BARREL_MASK), 70 + str_yes_no(cpuinfo.use_instr & PVR2_USE_MSR_INSTR), 71 + str_yes_no(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR), 72 + str_yes_no(cpuinfo.use_instr & PVR0_USE_DIV_MASK)); 73 73 74 74 seq_printf(m, " MMU:\t\t%x\n", cpuinfo.mmu); 75 75 ··· 120 120 121 121 seq_printf(m, 122 122 "HW-Debug:\t%s\n", 123 - cpuinfo.hw_debug ? "yes" : "no"); 123 + str_yes_no(cpuinfo.hw_debug)); 124 124 125 125 seq_printf(m, 126 126 "PVR-USR1:\t%02x\n"
+10
arch/microblaze/kernel/microblaze_ksyms.c
··· 16 16 #include <asm/page.h> 17 17 #include <linux/ftrace.h> 18 18 #include <linux/uaccess.h> 19 + #include <asm/xilinx_mb_manager.h> 19 20 20 21 #ifdef CONFIG_FUNCTION_TRACER 21 22 extern void _mcount(void); ··· 47 46 EXPORT_SYMBOL(__udivsi3); 48 47 extern void __umodsi3(void); 49 48 EXPORT_SYMBOL(__umodsi3); 49 + 50 + #ifdef CONFIG_MB_MANAGER 51 + extern void xmb_manager_register(uintptr_t phys_baseaddr, u32 cr_val, 52 + void (*callback)(void *data), 53 + void *priv, void (*reset_callback)(void *data)); 54 + EXPORT_SYMBOL(xmb_manager_register); 55 + extern asmlinkage void xmb_inject_err(void); 56 + EXPORT_SYMBOL(xmb_inject_err); 57 + #endif