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 branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
ipc
/
syscall.c
diff --git
a/ipc/syscall.c
b/ipc/syscall.c
index
1d6f53f
..
0d1e32c
100644
(file)
--- a/
ipc/syscall.c
+++ b/
ipc/syscall.c
@@
-73,7
+73,7
@@
SYSCALL_DEFINE6(ipc, unsigned int, call, int, first, unsigned long, second,
default: {
unsigned long raddr;
ret = do_shmat(first, (char __user *)ptr,
- second, &raddr);
+ second, &raddr
, SHMLBA
);
if (ret)
return ret;
return put_user(raddr, (unsigned long __user *) third);