RHBZ1842866 kernel-rt port: treat CONFIG_PREEMPT_RT as if ..._FULL

Until recently CONFIG_PREEMPT_RT_FULL was the config switch used by
PREEMPT_RT (and RHEL-RT up to 8.2) for building an RT kernel.
Upstream commit a50a3f4b6a313 ("sched/rt, Kconfig: Introduce
CONFIG_PREEMPT_RT") changed that to be CONFIG_PREEMPT_RT.

diff --git a/runtime/linux/stat_runtime.h b/runtime/linux/stat_runtime.h
index 44428b78f60d7adbbf4ab0911c7e49f95cc6ab26..edb239ae5044ada2b1df048ec2c08eda2e186f1a 100644 (file)
--- a/runtime/linux/stat_runtime.h
+++ b/runtime/linux/stat_runtime.h
@@ -14,7 +14,7 @@
 #define STAT_LOCK(sd)          do {} while (0)
 #define STAT_UNLOCK(sd)                do {} while (0)
 /* get/put_cpu wrappers.  Unnecessary if caller is already atomic. */
-#ifdef CONFIG_PREEMPT_RT_FULL
+#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT_RT)
 #define STAT_GET_CPU()         raw_smp_processor_id()
 #else
 #define STAT_GET_CPU()         smp_processor_id()

diff --git a/runtime/stp_helper_lock.h b/runtime/stp_helper_lock.h
index 7fe79f77ef66eb08b80d692fa49472b285d21bb6..81e6a1644dee549aeca38140ace0a85226dd6a4c 100644 (file)
--- a/runtime/stp_helper_lock.h
+++ b/runtime/stp_helper_lock.h
@@ -17,7 +17,7 @@
 
 #include <linux/spinlock.h>
 
-#ifdef CONFIG_PREEMPT_RT_FULL
+#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT_RT)
 
 #define stp_spinlock_t raw_spinlock_t
 

diff --git a/runtime/stp_utrace.c b/runtime/stp_utrace.c
index abdf7dacb5b8ae1206874e32d1dd1afeb04b8ac3..c5c06df43760b5504b6e830322f2990a6f002e27 100644 (file)
--- a/runtime/stp_utrace.c
+++ b/runtime/stp_utrace.c
@@ -41,7 +41,7 @@
 // For now, disable the task_work_queue on non-RT kernels.
 // XXX: Need to decide correct CONFIG_* to check for,
 // sticking with the more conservative option for now.
-#ifdef CONFIG_PREEMPT_RT_FULL
+#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT_RT)
 #define STP_UTRACE_USE_TASK_WORK_QUEUE
 #endif
 /* If STP_UTRACE_USE_TASK_WORK_QUEUE is defined, reporting work

diff --git a/testsuite/systemtap.examples/process/pfiles.stp b/testsuite/systemtap.examples/process/pfiles.stp
index e680cbda613911efceda9299f5df7f685e10ecb7..d52a1547b22e7f6a061b3edfeef69abd8e8a5999 100755 (executable)
--- a/testsuite/systemtap.examples/process/pfiles.stp
+++ b/testsuite/systemtap.examples/process/pfiles.stp
@@ -88,8 +88,8 @@
 
 # XXX: For the time being, mark this example as not working on PREEMPT_RT kernels:
 %{
-#ifdef CONFIG_PREEMPT_RT_FULL
-#error "pfiles.stp not supported on CONFIG_PREEMPT_RT_FULL kernels"
+#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT_RT)
+#error "pfiles.stp not supported on PREEMPT_RT kernels"
 #endif
 %}