diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /arch/microblaze/kernel/sys_microblaze.c | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/microblaze/kernel/sys_microblaze.c')
| -rw-r--r-- | arch/microblaze/kernel/sys_microblaze.c | 2 |
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) | |||
| 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) |