summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 19:20:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-07 19:20:28 -0700
commit6715a52a581c891e9a2034abe1c81ddb482d70b3 (patch)
tree03bac8851232d11382af718c2d10559cc16e4f0f /include
parentef2398019b305827ea7130ebaf7bf521b444530e (diff)
parent6c6c54e1807faf116724451ef2bd14993780470a (diff)
downloadlinux-6715a52a581c891e9a2034abe1c81ddb482d70b3.tar.gz
linux-6715a52a581c891e9a2034abe1c81ddb482d70b3.tar.bz2
linux-6715a52a581c891e9a2034abe1c81ddb482d70b3.zip
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix/clarify set_task_cpu() locking rules lockdep: Fix lock_is_held() on recursion sched: Fix schedstat.nr_wakeups_migrate sched: Fix cross-cpu clock sync on remote wakeups
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2a8621c4be1e..a837b20ba190 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1063,6 +1063,7 @@ struct sched_domain;
*/
#define WF_SYNC 0x01 /* waker goes to sleep after wakup */
#define WF_FORK 0x02 /* child wakeup after fork */
+#define WF_MIGRATED 0x04 /* internal use, task got migrated */
#define ENQUEUE_WAKEUP 1
#define ENQUEUE_HEAD 2