diff options
| author | Dmitry Torokhov <[email protected]> | 2014-09-03 16:01:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2014-09-03 16:01:36 -0700 |
| commit | 516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch) | |
| tree | ff37e84692dbef5063bbf22672eb8bfad0f25dd8 /include/linux/init_task.h | |
| parent | 6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 6df7f9fe0d01..2bb4c4f3531a 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -102,12 +102,6 @@ extern struct group_info init_groups; #define INIT_IDS #endif -#ifdef CONFIG_RCU_BOOST -#define INIT_TASK_RCU_BOOST() \ - .rcu_boost_mutex = NULL, -#else -#define INIT_TASK_RCU_BOOST() -#endif #ifdef CONFIG_TREE_PREEMPT_RCU #define INIT_TASK_RCU_TREE_PREEMPT() \ .rcu_blocked_node = NULL, @@ -119,8 +113,7 @@ extern struct group_info init_groups; .rcu_read_lock_nesting = 0, \ .rcu_read_unlock_special = 0, \ .rcu_node_entry = LIST_HEAD_INIT(tsk.rcu_node_entry), \ - INIT_TASK_RCU_TREE_PREEMPT() \ - INIT_TASK_RCU_BOOST() + INIT_TASK_RCU_TREE_PREEMPT() #else #define INIT_TASK_RCU_PREEMPT(tsk) #endif |