diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /include/linux/sched.h | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d747f948b34e..777d8a5ed06b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1744,7 +1744,7 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t * | |||
| 1744 | #define PF_MCE_EARLY 0x08000000 /* Early kill for mce process policy */ | 1744 | #define PF_MCE_EARLY 0x08000000 /* Early kill for mce process policy */ |
| 1745 | #define PF_MEMPOLICY 0x10000000 /* Non-default NUMA mempolicy */ | 1745 | #define PF_MEMPOLICY 0x10000000 /* Non-default NUMA mempolicy */ |
| 1746 | #define PF_MUTEX_TESTER 0x20000000 /* Thread belongs to the rt mutex tester */ | 1746 | #define PF_MUTEX_TESTER 0x20000000 /* Thread belongs to the rt mutex tester */ |
| 1747 | #define PF_FREEZER_SKIP 0x40000000 /* Freezer should not count it as freezeable */ | 1747 | #define PF_FREEZER_SKIP 0x40000000 /* Freezer should not count it as freezable */ |
| 1748 | #define PF_FREEZER_NOSIG 0x80000000 /* Freezer won't send signals to it */ | 1748 | #define PF_FREEZER_NOSIG 0x80000000 /* Freezer won't send signals to it */ |
| 1749 | 1749 | ||
| 1750 | /* | 1750 | /* |