Merge commit 'v2.6.39-rc4' into sched/core
Merge reason: Pick up upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@ -1247,6 +1247,9 @@ struct task_struct {
|
||||
#endif
|
||||
|
||||
struct mm_struct *mm, *active_mm;
|
||||
#ifdef CONFIG_COMPAT_BRK
|
||||
unsigned brk_randomized:1;
|
||||
#endif
|
||||
#if defined(SPLIT_RSS_COUNTING)
|
||||
struct task_rss_stat rss_stat;
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user