From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 24 Apr 2009 08:11:18 +0000 (+0200)
Subject: Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=416dfdcdb894432547ead4fcb9fa6a36b396059e;p=linux-beck.git

Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
	arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
              dependency change from upstream so that we can remove it
	      here.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

416dfdcdb894432547ead4fcb9fa6a36b396059e
diff --cc arch/x86/kernel/ptrace.c
index b32a8ee53381,23b7c8f017e2..d5252ae6c520
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@@ -21,8 -21,6 +21,7 @@@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
- #include <linux/ftrace.h>
 +#include <linux/workqueue.h>
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
diff --cc kernel/ptrace.c
index 321127d965c2,dfcd83ceee3b..4559e84f4b8a
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@@ -21,11 -21,19 +21,9 @@@
  #include <linux/audit.h>
  #include <linux/pid_namespace.h>
  #include <linux/syscalls.h>
- 
- #include <asm/pgtable.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
  
  
 -/*
 - * Initialize a new task whose father had been ptraced.
 - *
 - * Called from copy_process().
 - */
 -void ptrace_fork(struct task_struct *child, unsigned long clone_flags)
 -{
 -	arch_ptrace_fork(child, clone_flags);
 -}
 -
  /*
   * ptrace a task: make the debugger its new parent and
   * move it to the ptrace list.