Merge branch 'core/locking' into tracing/ftrace

2009-03-13 01:33:21 +01:00
parent aecfcde920 d820ac4c2f
commit 480c93df5b
98 changed files with 983 additions and 716 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1423,6 +1423,9 @@ struct task_struct {
 #endif
 };

+/* Future-safe accessor for struct task_struct's cpus_allowed. */
+#define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
+
 /*
 * Priority of a process goes from 0..MAX_PRIO-1, valid RT
 * priority is 0..MAX_RT_PRIO-1, and SCHED_NORMAL/SCHED_BATCH