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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix return value for sys_ipc
microblaze: Storage class should be before const qualifier

Linus Torvalds b20a4e94 201517a7

+3 -3
+2 -2
arch/microblaze/kernel/cpu/cpuinfo-static.c
··· 14 14 #include <asm/cpuinfo.h> 15 15 #include <asm/pvr.h> 16 16 17 - const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; 18 - const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; 17 + static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; 18 + static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; 19 19 20 20 #define err_printk(x) \ 21 21 early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n");
+1 -1
arch/microblaze/kernel/sys_microblaze.c
··· 131 131 ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); 132 132 break; 133 133 } 134 - return -EINVAL; 134 + return ret; 135 135 } 136 136 137 137 asmlinkage int sys_vfork(struct pt_regs *regs)