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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sparc
/
kernel
/
sys_sparc_64.c
diff --git
a/arch/sparc/kernel/sys_sparc_64.c
b/arch/sparc/kernel/sys_sparc_64.c
index c38e5aaae56f2def7f8255a3347be46247c354f9..0dc1f578608131002da0b869dcfa7c56b4b149e3 100644
(file)
--- a/
arch/sparc/kernel/sys_sparc_64.c
+++ b/
arch/sparc/kernel/sys_sparc_64.c
@@
-470,7
+470,7
@@
SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
switch (call) {
case SHMAT: {
ulong raddr;
- err = do_shmat(first, ptr, (int)second, &raddr);
+ err = do_shmat(first, ptr, (int)second, &raddr
, SHMLBA
);
if (!err) {
if (put_user(raddr,
(ulong __user *) third))