diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-08 19:24:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-08 19:24:25 -0400 |
commit | b20a4e9483df7469359f0c7f3f70bd2f5b78677f (patch) | |
tree | 055317c6b248beb389e510b515838e8fc8eccfda /arch/microblaze | |
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
Diffstat (limited to 'arch/microblaze')
-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 cfe44effdb7..450ca6bb828 100644 --- a/arch/microblaze/kernel/cpu/cpuinfo-static.c +++ b/arch/microblaze/kernel/cpu/cpuinfo-static.c | |||
@@ -14,8 +14,8 @@ | |||
14 | #include <asm/cpuinfo.h> | 14 | #include <asm/cpuinfo.h> |
15 | #include <asm/pvr.h> | 15 | #include <asm/pvr.h> |
16 | 16 | ||
17 | const static char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; | 17 | static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; |
18 | const static char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; | 18 | static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER; |
19 | 19 | ||
20 | #define err_printk(x) \ | 20 | #define err_printk(x) \ |
21 | early_printk("ERROR: Microblaze " x "- different for kernel and DTS\n"); | 21 | 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 ba0568c2cc1..31905ff590b 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) | |||
131 | ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); | 131 | ret = sys_shmctl(first, second, (struct shmid_ds *) ptr); |
132 | break; | 132 | break; |
133 | } | 133 | } |
134 | return -EINVAL; | 134 | return ret; |
135 | } | 135 | } |
136 | 136 | ||
137 | asmlinkage int sys_vfork(struct pt_regs *regs) | 137 | asmlinkage int sys_vfork(struct pt_regs *regs) |