Merge commit 'v2.6.39-rc7' into sched/core

2011-05-12 09:36:18 +02:00
parent 7142d17e8f 693d92a1bb
commit 9cb5baba5e
560 changed files with 6290 additions and 3272 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1525,6 +1525,9 @@ struct task_struct {
 		unsigned long memsw_nr_pages; /* uncharged mem+swap usage */
 	} memcg_batch;
 #endif
+#ifdef CONFIG_HAVE_HW_BREAKPOINT
+	atomic_t ptrace_bp_refcnt;
+#endif
 };

 /* Future-safe accessor for struct task_struct's cpus_allowed. */