2 files changed, 8 insertions, 4 deletions

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 7f2e16e76ac4..041f7e56a289 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -158,8 +158,10 @@ extern void syscall_unregfunc(void);
                  * For rcuidle callers, use srcu since sched-rcu        \
                  * doesn't work from the idle path.                     \
                  */                                                     \
-                if (rcuidle)                                            \
+                if (rcuidle) {                                          \
                         idx = srcu_read_lock_notrace(&tracepoint_srcu); \
+                        rcu_irq_enter_irqson();                         \
+                }                                                       \
                                                                         \
                 it_func_ptr = rcu_dereference_raw((tp)->funcs);         \
                                                                         \
@@ -171,8 +173,10 @@ extern void syscall_unregfunc(void);
                         } while ((++it_func_ptr)->func);                \
                 }                                                       \
                                                                         \
-                if (rcuidle)                                            \
+                if (rcuidle) {                                          \
+                        rcu_irq_exit_irqson();                          \
                         srcu_read_unlock_notrace(&tracepoint_srcu, idx);\
+                }                                                       \
                                                                         \
                 preempt_enable_notrace();                               \
         } while (0)
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
index a0a74c533e4b..0913b4d385de 100644
--- a/kernel/printk/printk_safe.c
+++ b/kernel/printk/printk_safe.c
@@ -306,12 +306,12 @@ static __printf(1, 0) int vprintk_nmi(const char *fmt, va_list args)
         return printk_safe_log_store(s, fmt, args);
 }
 
-void printk_nmi_enter(void)
+void notrace printk_nmi_enter(void)
 {
         this_cpu_or(printk_context, PRINTK_NMI_CONTEXT_MASK);
 }
 
-void printk_nmi_exit(void)
+void notrace printk_nmi_exit(void)
 {
         this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK);
 }