arch/microblaze fixes for 2.6.30-rc6
Michal Simek
maintainerHi Linus,
please pull the following changes.
Thanks,
Michal
The following changes since commit 091438dd5668396328a3419abcbc6591159eb8d1:
Linus Torvalds (1):
Linux 2.6.30-rc4
are available in the git repository at:
git://git.monstr.eu/linux-2.6-microblaze.git fixes-for-linus
Michal Simek (1):
microblaze: Fix return value for sys_ipc
Tobias Klauser (1):
microblaze: Storage class should be before const qualifier
arch/microblaze/kernel/cpu/cpuinfo-static.c | 4 ++-- arch/microblaze/kernel/sys_microblaze.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/microblaze/kernel/cpu/cpuinfo-static.c +2 -2
@@ -14,8 +14,8 @@#include <asm/cpuinfo.h> #include <asm/pvr.h> -const static char family_string[] =CONFIG_XILINX_MICROBLAZE0_FAMILY ; -const static char cpu_ver_string[] =CONFIG_XILINX_MICROBLAZE0_HW_VER ; +static const char family_string[] =CONFIG_XILINX_MICROBLAZE0_FAMILY ; +static const char cpu_ver_string[] =CONFIG_XILINX_MICROBLAZE0_HW_VER ;#define err_printk (x) \ early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n");
arch/microblaze/kernel/sys_microblaze.c +1 -1
@@ -131,7 +131,7 @@ sys_ipc(uint call, int first, int second, int third, void *ptr, long fifth) ret =sys_shmctl (first, second, (struct shmid_ds *) ptr);break ; } -return -EINVAL ; +return ret; } asmlinkage int sys_vfork(struct pt_regs *regs)
Signature · 2 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854