From a8a48de6fe6818dfe12220d8d21bc2fa7532d8db Mon Sep 17 00:00:00 2001 From: Clark Williams <clark.williams@gmail.com> Date: Tue, 6 Feb 2024 12:17:19 -0600 Subject: [PATCH 191/204] Revert "preempt: Put preempt_enable() within an instrumentation*() section." This reverts commit cc3d27d9fdeddcb82db3ea176a44a5509e70eb1c. This code was fixed in 6.6 stable so no need for it in the RT series Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Clark Williams <williams@redhat.com> --- include/linux/preempt.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) Index: linux-6.6.58-rt45/include/linux/preempt.h =================================================================== @ linux-6.6.58-rt45/include/linux/preempt.h:233 @ do { \ #define preempt_enable() \ do { \ barrier(); \ - if (unlikely(preempt_count_dec_and_test())) { \ - instrumentation_begin(); \ + if (unlikely(preempt_count_dec_and_test())) \ __preempt_schedule(); \ - instrumentation_end(); \ - } \ } while (0) #define preempt_enable_notrace() \ do { \ barrier(); \ - if (unlikely(__preempt_count_dec_and_test())) { \ - instrumentation_begin(); \ + if (unlikely(__preempt_count_dec_and_test())) \ __preempt_schedule_notrace(); \ - instrumentation_end(); \ - } \ } while (0) #define preempt_check_resched() \