diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-16 08:04:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-16 08:05:04 -0400 |
| commit | 563c4f85f9f0d63b712081d5b4522152cdcb8b6b (patch) | |
| tree | 92351ab2d60d5fd7ce5745d21c9a60ce6d46c5dd /init/init_task.c | |
| parent | 4adcdcea717cb2d8436bef00dd689aa5bc76f11b (diff) | |
| parent | 09c7e8b21d67c3c78ab9701dbc0fb1e9f14a0ba5 (diff) | |
Merge branch 'sched/rt' into sched/core, to pick up -rt changes
Pick up the first couple of patches working towards PREEMPT_RT.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init/init_task.c')
| -rw-r--r-- | init/init_task.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/init_task.c b/init/init_task.c index 7ab773b9b3cd..bfe06c53b14e 100644 --- a/init/init_task.c +++ b/init/init_task.c | |||
| @@ -174,7 +174,7 @@ struct task_struct init_task | |||
| 174 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 174 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
| 175 | .ret_stack = NULL, | 175 | .ret_stack = NULL, |
| 176 | #endif | 176 | #endif |
| 177 | #if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPT) | 177 | #if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPTION) |
| 178 | .trace_recursion = 0, | 178 | .trace_recursion = 0, |
| 179 | #endif | 179 | #endif |
| 180 | #ifdef CONFIG_LIVEPATCH | 180 | #ifdef CONFIG_LIVEPATCH |