diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-08 16:24:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-08 16:24:25 -0700 |
| commit | b20a4e9483df7469359f0c7f3f70bd2f5b78677f (patch) | |
| tree | 055317c6b248beb389e510b515838e8fc8eccfda | |
| parent | 201517a7f3ec497fff545a7659c6c876f89f9054 (diff) | |
| parent | c71a7a3875b40d18a08c09f6c757bd7a9b6ce894 (diff) | |
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
| -rw-r--r-- | arch/microblaze/kernel/cpu/cpuinfo-static.c | 4 | ||||
| -rw-r--r-- | arch/microblaze/kernel/sys_microblaze.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/kernel/cpu/cpuinfo-static.c b/arch/microblaze/kernel/cpu/cpuinfo-static.c index cfe44effdb77..450ca6bb828d 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c @@ -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"); diff --git a/arch/microblaze/kernel/sys_microblaze.c b/arch/microblaze/kernel/sys_microblaze.c index ba0568c2cc1c..31905ff590b7 100644 --- a/arch/microblaze/kernel/sys_microblaze.c +++ b/arch/microblaze/kernel/sys_microblaze.c @@ -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) |