linux-next: manual merge of the signal tree with the mips tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature