diff options
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c900aa530070..1048bf50540a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1318,7 +1318,8 @@ struct task_struct { | |||
1318 | /* Thread group tracking */ | 1318 | /* Thread group tracking */ |
1319 | u32 parent_exec_id; | 1319 | u32 parent_exec_id; |
1320 | u32 self_exec_id; | 1320 | u32 self_exec_id; |
1321 | /* Protection of (de-)allocation: mm, files, fs, tty, keyrings */ | 1321 | /* Protection of (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, |
1322 | * mempolicy */ | ||
1322 | spinlock_t alloc_lock; | 1323 | spinlock_t alloc_lock; |
1323 | 1324 | ||
1324 | #ifdef CONFIG_GENERIC_HARDIRQS | 1325 | #ifdef CONFIG_GENERIC_HARDIRQS |
@@ -1386,8 +1387,7 @@ struct task_struct { | |||
1386 | cputime_t acct_timexpd; /* stime + utime since last update */ | 1387 | cputime_t acct_timexpd; /* stime + utime since last update */ |
1387 | #endif | 1388 | #endif |
1388 | #ifdef CONFIG_CPUSETS | 1389 | #ifdef CONFIG_CPUSETS |
1389 | nodemask_t mems_allowed; | 1390 | nodemask_t mems_allowed; /* Protected by alloc_lock */ |
1390 | int cpuset_mems_generation; | ||
1391 | int cpuset_mem_spread_rotor; | 1391 | int cpuset_mem_spread_rotor; |
1392 | #endif | 1392 | #endif |
1393 | #ifdef CONFIG_CGROUPS | 1393 | #ifdef CONFIG_CGROUPS |
@@ -1410,7 +1410,7 @@ struct task_struct { | |||
1410 | struct list_head perf_counter_list; | 1410 | struct list_head perf_counter_list; |
1411 | #endif | 1411 | #endif |
1412 | #ifdef CONFIG_NUMA | 1412 | #ifdef CONFIG_NUMA |
1413 | struct mempolicy *mempolicy; | 1413 | struct mempolicy *mempolicy; /* Protected by alloc_lock */ |
1414 | short il_next; | 1414 | short il_next; |
1415 | #endif | 1415 | #endif |
1416 | atomic_t fs_excl; /* holding fs exclusive resources */ | 1416 | atomic_t fs_excl; /* holding fs exclusive resources */ |