git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.39-rc6' into x86/cleanups
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
sys_oabi-compat.c
diff --git
a/arch/arm/kernel/sys_oabi-compat.c
b/arch/arm/kernel/sys_oabi-compat.c
index
4ad8da1
..
af0aaeb
100644
(file)
--- a/
arch/arm/kernel/sys_oabi-compat.c
+++ b/
arch/arm/kernel/sys_oabi-compat.c
@@
-311,7
+311,7
@@
asmlinkage long sys_oabi_semtimedop(int semid,
long err;
int i;
- if (nsops < 1)
+ if (nsops < 1
|| nsops > SEMOPM
)
return -EINVAL;
sops = kmalloc(sizeof(*sops) * nsops, GFP_KERNEL);
if (!sops)