diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 07:48:17 -0400 |
commit | f648972e017659c741bdd3be6b4aeb2d73672031 (patch) | |
tree | a71e69aa8bd0259bdf4f5b0361c773eeae36b794 /arch/sh/kernel/sys_sh.c | |
parent | 8c56250f48347750c82ab18d98d647dcf99ca674 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) |
Merge commit 'v2.6.27-rc6' into core/locking
Diffstat (limited to 'arch/sh/kernel/sys_sh.c')
-rw-r--r-- | arch/sh/kernel/sys_sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 59cd2859ce9b..9061b86d73fa 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c | |||
@@ -170,7 +170,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, | |||
170 | version = call >> 16; /* hack for backward compatibility */ | 170 | version = call >> 16; /* hack for backward compatibility */ |
171 | call &= 0xffff; | 171 | call &= 0xffff; |
172 | 172 | ||
173 | if (call <= SEMCTL) | 173 | if (call <= SEMTIMEDOP) |
174 | switch (call) { | 174 | switch (call) { |
175 | case SEMOP: | 175 | case SEMOP: |
176 | return sys_semtimedop(first, | 176 | return sys_semtimedop(first, |