From a3d882825795c1e70c5139cd7cf2d9a1e41399a2 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 30 Apr 2009 09:35:53 +0200 Subject: [PATCH] --- yaml --- r: 144727 b: refs/heads/master c: c71a7a3875b40d18a08c09f6c757bd7a9b6ce894 h: refs/heads/master i: 144725: eec01ef9680039bcc134f56c5c2c51b12a4f5141 144723: 5b941059dc6be7c95f9bcd1b08699b9e18c2afba 144719: 44b0719496f1b83c662c53701538cce58e4b840b v: v3 --- [refs] | 2 +- trunk/arch/microblaze/kernel/sys_microblaze.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9aafd9c4cfd..c5b7eb34cdb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 595e8fabea22c96f674102f33b4a759f4512dd9c +refs/heads/master: c71a7a3875b40d18a08c09f6c757bd7a9b6ce894 diff --git a/trunk/arch/microblaze/kernel/sys_microblaze.c b/trunk/arch/microblaze/kernel/sys_microblaze.c index ba0568c2cc1c..31905ff590b7 100644 --- a/trunk/arch/microblaze/kernel/sys_microblaze.c +++ b/trunk/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)