diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-12 03:36:18 -0400 |
| commit | 9cb5baba5e3acba0994ad899ee908799104c9965 (patch) | |
| tree | d5ff16000256a0bf56279926e6114b4603ede2b4 /include/linux/sched.h | |
| parent | 7142d17e8f935fa842e9f6eece2281b6d41625d6 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into sched/core
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 013314a56105..6b4280b23ee6 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1525,6 +1525,9 @@ struct task_struct { | |||
| 1525 | unsigned long memsw_nr_pages; /* uncharged mem+swap usage */ | 1525 | unsigned long memsw_nr_pages; /* uncharged mem+swap usage */ |
| 1526 | } memcg_batch; | 1526 | } memcg_batch; |
| 1527 | #endif | 1527 | #endif |
| 1528 | #ifdef CONFIG_HAVE_HW_BREAKPOINT | ||
| 1529 | atomic_t ptrace_bp_refcnt; | ||
| 1530 | #endif | ||
| 1528 | }; | 1531 | }; |
| 1529 | 1532 | ||
| 1530 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ | 1533 | /* Future-safe accessor for struct task_struct's cpus_allowed. */ |