aboutsummaryrefslogtreecommitdiff
path: root/arch/microblaze/kernel/sys_microblaze.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-08 16:24:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-08 16:24:25 -0700
commitb20a4e9483df7469359f0c7f3f70bd2f5b78677f (patch)
tree055317c6b248beb389e510b515838e8fc8eccfda /arch/microblaze/kernel/sys_microblaze.c
parent201517a7f3ec497fff545a7659c6c876f89f9054 (diff)
parentc71a7a3875b40d18a08c09f6c757bd7a9b6ce894 (diff)
downloadlinux-stericsson-b20a4e9483df7469359f0c7f3f70bd2f5b78677f.tar.gz
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/kernel/sys_microblaze.c')
-rw-r--r--arch/microblaze/kernel/sys_microblaze.c2
1 files changed, 1 insertions, 1 deletions
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)