diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/linux/init_task.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 5cd0f0949927..b0ed422e4e4a 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -32,10 +32,10 @@ extern struct fs_struct init_fs; | |||
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #ifdef CONFIG_CPUSETS | 34 | #ifdef CONFIG_CPUSETS |
| 35 | #define INIT_CPUSET_SEQ \ | 35 | #define INIT_CPUSET_SEQ(tsk) \ |
| 36 | .mems_allowed_seq = SEQCNT_ZERO, | 36 | .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq), |
| 37 | #else | 37 | #else |
| 38 | #define INIT_CPUSET_SEQ | 38 | #define INIT_CPUSET_SEQ(tsk) |
| 39 | #endif | 39 | #endif |
| 40 | 40 | ||
| 41 | #define INIT_SIGNALS(sig) { \ | 41 | #define INIT_SIGNALS(sig) { \ |
| @@ -220,7 +220,7 @@ extern struct task_group root_task_group; | |||
| 220 | INIT_FTRACE_GRAPH \ | 220 | INIT_FTRACE_GRAPH \ |
| 221 | INIT_TRACE_RECURSION \ | 221 | INIT_TRACE_RECURSION \ |
| 222 | INIT_TASK_RCU_PREEMPT(tsk) \ | 222 | INIT_TASK_RCU_PREEMPT(tsk) \ |
| 223 | INIT_CPUSET_SEQ \ | 223 | INIT_CPUSET_SEQ(tsk) \ |
| 224 | INIT_VTIME(tsk) \ | 224 | INIT_VTIME(tsk) \ |
| 225 | } | 225 | } |
| 226 | 226 | ||