From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jun 2009 21:07:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.31-rc1~139
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/15fc204afc6feb915c400159546f646eca8ba1d9?hp=-c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits)
  sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn
  sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs.
  sh: remove stray markers.
  sh: defconfig updates.
  sh: pci: Initial PCI-Express support for SH7786 Urquell board.
  sh: Generic HAVE_PERF_COUNTER support.
  SH: convert migor to soc-camera as platform-device
  SH: convert ap325rxa to soc-camera as platform-device
  soc-camera: unify i2c camera device platform data
  sh: add platform data for r8a66597-hcd in setup-sh7723
  sh: add platform data for r8a66597-hcd in setup-sh7366
  sh: x3proto: add platform data for r8a66597-hcd
  sh: highlander: add platform data for r8a66597-hcd
  sh: sh7785lcr: add platform data for r8a66597-hcd
  sh: turn off irqs when disabling CMT/TMU timers
  sh: use kzalloc() for cpg clocks
  sh: unbreak WARN_ON()
  sh: Use generic atomic64_t implementation.
  sh: Revised clock function in highlander
  sh: Update r7780mp defconfig
  ...
---

15fc204afc6feb915c400159546f646eca8ba1d9
diff --combined arch/sh/kernel/process_32.c
index 601bbc0ec74e,eea4cf9d44b6..92d7740faab1
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@@ -119,8 -119,6 +119,6 @@@ int kernel_thread(int (*fn)(void *), vo
  	pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
  		      &regs, 0, NULL, NULL);
  
- 	trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
- 
  	return pid;
  }
  
@@@ -367,6 -365,11 +365,6 @@@ asmlinkage int sys_execve(char __user *
  		goto out;
  
  	error = do_execve(filename, uargv, uenvp, regs);
 -	if (error == 0) {
 -		task_lock(current);
 -		current->ptrace &= ~PT_DTRACE;
 -		task_unlock(current);
 -	}
  	putname(filename);
  out:
  	return error;
diff --combined arch/sh/kernel/process_64.c
index 3826773496d8,44c80770b8c2..24de74214940
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@@ -323,7 -323,6 +323,6 @@@ ATTRIB_NORET void kernel_thread_helper(
  int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
  {
  	struct pt_regs regs;
- 	int pid;
  
  	memset(&regs, 0, sizeof(regs));
  	regs.regs[2] = (unsigned long)arg;
@@@ -333,12 -332,8 +332,8 @@@
  	regs.sr = (1 << 30);
  
  	/* Ok, create the new process.. */
- 	pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
+ 	return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
  		      &regs, 0, NULL, NULL);
- 
- 	trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
- 
- 	return pid;
  }
  
  /*
@@@ -529,6 -524,11 +524,6 @@@ asmlinkage int sys_execve(char *ufilena
  			  (char __user * __user *)uargv,
  			  (char __user * __user *)uenvp,
  			  pregs);
 -	if (error == 0) {
 -		task_lock(current);
 -		current->ptrace &= ~PT_DTRACE;
 -		task_unlock(current);
 -	}
  	putname(filename);
  out:
  	return error;