* linux-next: manual merge of the signal tree with the mips tree
@ 2013-03-12 3:22 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-03-12 3:22 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/mips/kernel/linux32.c between commit 63981a409608 ("MIPS: compat:
Return same error ENOSYS as native for invalid operation") from the mips
tree and commit 56e41d3c5aa8 ("merge compat sys_ipc instances") from the
signal tree.
The latter removed the code fixed by the former, so I did that and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the signal tree with the mips tree
@ 2013-02-04 6:36 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-02-04 6:36 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/mips/kernel/syscall.c between commit 7034228792cc ("MIPS: Whitespace
cleanup") from the mips tree and commit 50150d2bb903 ("mips: switch to
generic sys_fork() and sys_clone()") from the signal tree.
I fixed it up (the sys_clone stuff was removed by the latter - see below)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mips/kernel/syscall.c
index d7feee0,b32466a..0000000
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@@ -41,25 -41,19 +41,19 @@@
/*
* For historic reasons the pipe(2) syscall on MIPS has an unusual calling
- * convention. It returns results in registers $v0 / $v1 which means there
+ * convention. It returns results in registers $v0 / $v1 which means there
* is no need for it to do verify the validity of a userspace pointer
- * argument. Historically that used to be expensive in Linux. These days
+ * argument. Historically that used to be expensive in Linux. These days
* the performance advantage is negligible.
*/
- asmlinkage int sysm_pipe(nabi_no_regargs volatile struct pt_regs regs)
+ asmlinkage int sysm_pipe(void)
{
int fd[2];
- int error, res;
-
- error = do_pipe_flags(fd, 0);
- if (error) {
- res = error;
- goto out;
- }
- regs.regs[3] = fd[1];
- res = fd[0];
- out:
- return res;
+ int error = do_pipe_flags(fd, 0);
+ if (error)
+ return error;
+ current_pt_regs()->regs[3] = fd[1];
+ return fd[0];
}
SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the signal tree with the mips tree
@ 2013-01-02 3:11 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-01-02 3:11 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
Hi Al,
Today's linux-next merge of the signal tree got a conflict in
arch/mips/kernel/syscall.c between commit 12890d0f61fc ("MIPS: sysmips:
Rewrite to use SYSCALL_DEFINE3()") from the mips tree and commit
cc524ca3714b ("mips: kill sysmips() wrapper, switch to SYSCALL_DEFINE")
from the signal tree.
These patches are doing the same thing. I fixed it up (using the mips
tree version, which no longer passes regs to mips_atomic_set()) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-12 3:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-12 3:22 linux-next: manual merge of the signal tree with the mips tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-02-04 6:36 Stephen Rothwell
2013-01-02 3:11 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).