squash! torture: Add a hazptrtorture.c stress test [ paulmck: Apply kernel test robot feedback. ] Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
diff --git a/include/linux/torture.h b/include/linux/torture.h index ff3f688..66d2d44 100644 --- a/include/linux/torture.h +++ b/include/linux/torture.h
@@ -131,7 +131,7 @@ void _torture_stop_kthread(char *m, struct task_struct **tp); #endif void torture_sched_set_normal(struct task_struct *t, int nice); -#if IS_REACHABLE(CONFIG_RCU_TORTURE_TEST) || IS_REACHABLE(CONFIG_LOCK_TORTURE_TEST) || IS_REACHABLE(CONFIG_HAZPTR_TORTURE_TEST) +#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_ENABLED(CONFIG_HAZPTR_TORTURE_TEST) long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask, bool dowarn); #endif
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c index 7cce69b..2a778b8 100644 --- a/kernel/rcu/update.c +++ b/kernel/rcu/update.c
@@ -44,6 +44,7 @@ #include <linux/slab.h> #include <linux/irq_work.h> #include <linux/rcupdate_trace.h> +#include <linux/torture.h> #define CREATE_TRACE_POINTS @@ -525,7 +526,7 @@ EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read); do { } while (0) #endif -#if IS_REACHABLE(CONFIG_RCU_TORTURE_TEST) || IS_REACHABLE(CONFIG_LOCK_TORTURE_TEST) || IS_REACHABLE(CONFIG_HAZPTR_TORTURE_TEST) +#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_ENABLED(CONFIG_HAZPTR_TORTURE_TEST) /* Get rcutorture access to sched_setaffinity(). */ long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask, bool dowarn) {