diff options
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index a51c13c2b1a0..291a9bd5b97f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1116,6 +1116,7 @@ struct task_struct { | |||
1116 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 1116 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
1117 | /* Index of current stored address in ret_stack: */ | 1117 | /* Index of current stored address in ret_stack: */ |
1118 | int curr_ret_stack; | 1118 | int curr_ret_stack; |
1119 | int curr_ret_depth; | ||
1119 | 1120 | ||
1120 | /* Stack of return addresses for return function tracing: */ | 1121 | /* Stack of return addresses for return function tracing: */ |
1121 | struct ftrace_ret_stack *ret_stack; | 1122 | struct ftrace_ret_stack *ret_stack; |
@@ -1453,6 +1454,8 @@ static inline bool is_percpu_thread(void) | |||
1453 | #define PFA_SPREAD_SLAB 2 /* Spread some slab caches over cpuset */ | 1454 | #define PFA_SPREAD_SLAB 2 /* Spread some slab caches over cpuset */ |
1454 | #define PFA_SPEC_SSB_DISABLE 3 /* Speculative Store Bypass disabled */ | 1455 | #define PFA_SPEC_SSB_DISABLE 3 /* Speculative Store Bypass disabled */ |
1455 | #define PFA_SPEC_SSB_FORCE_DISABLE 4 /* Speculative Store Bypass force disabled*/ | 1456 | #define PFA_SPEC_SSB_FORCE_DISABLE 4 /* Speculative Store Bypass force disabled*/ |
1457 | #define PFA_SPEC_IB_DISABLE 5 /* Indirect branch speculation restricted */ | ||
1458 | #define PFA_SPEC_IB_FORCE_DISABLE 6 /* Indirect branch speculation permanently restricted */ | ||
1456 | 1459 | ||
1457 | #define TASK_PFA_TEST(name, func) \ | 1460 | #define TASK_PFA_TEST(name, func) \ |
1458 | static inline bool task_##func(struct task_struct *p) \ | 1461 | static inline bool task_##func(struct task_struct *p) \ |
@@ -1484,6 +1487,13 @@ TASK_PFA_CLEAR(SPEC_SSB_DISABLE, spec_ssb_disable) | |||
1484 | TASK_PFA_TEST(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable) | 1487 | TASK_PFA_TEST(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable) |
1485 | TASK_PFA_SET(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable) | 1488 | TASK_PFA_SET(SPEC_SSB_FORCE_DISABLE, spec_ssb_force_disable) |
1486 | 1489 | ||
1490 | TASK_PFA_TEST(SPEC_IB_DISABLE, spec_ib_disable) | ||
1491 | TASK_PFA_SET(SPEC_IB_DISABLE, spec_ib_disable) | ||
1492 | TASK_PFA_CLEAR(SPEC_IB_DISABLE, spec_ib_disable) | ||
1493 | |||
1494 | TASK_PFA_TEST(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable) | ||
1495 | TASK_PFA_SET(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable) | ||
1496 | |||
1487 | static inline void | 1497 | static inline void |
1488 | current_restore_flags(unsigned long orig_flags, unsigned long flags) | 1498 | current_restore_flags(unsigned long orig_flags, unsigned long flags) |
1489 | { | 1499 | { |