Merge branch 'linus' into core/locking

2009-03-13 01:29:17 +01:00
parent 03d78913f0 9ead64974b
commit 3c1f67d60e
284 changed files with 2903 additions and 2859 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1422,6 +1422,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