projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[firefly-linux-kernel-4.4.55.git]
/
ipc
/
syscall.c
diff --git
a/ipc/syscall.c
b/ipc/syscall.c
index 1d6f53f6b562441bcf5ef99c85067275eecf6c5a..0d1e32ce048eeb0ab0d8341519aedd7ead76db62 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);