patch-5.15.79-rt54.patch

[platform/kernel/linux-rpi.git] / include / linux / irqflags.h

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 600c10d..5ec0fa7 100644 (file)
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -20,13 +20,13 @@
 #ifdef CONFIG_PROVE_LOCKING
   extern void lockdep_softirqs_on(unsigned long ip);
   extern void lockdep_softirqs_off(unsigned long ip);
-  extern void lockdep_hardirqs_on_prepare(unsigned long ip);
+  extern void lockdep_hardirqs_on_prepare(void);
   extern void lockdep_hardirqs_on(unsigned long ip);
   extern void lockdep_hardirqs_off(unsigned long ip);
 #else
   static inline void lockdep_softirqs_on(unsigned long ip) { }
   static inline void lockdep_softirqs_off(unsigned long ip) { }
-  static inline void lockdep_hardirqs_on_prepare(unsigned long ip) { }
+  static inline void lockdep_hardirqs_on_prepare(void) { }
   static inline void lockdep_hardirqs_on(unsigned long ip) { }
   static inline void lockdep_hardirqs_off(unsigned long ip) { }
 #endif
@@ -71,14 +71,6 @@ do {                                         \
 do {                                           \
        __this_cpu_dec(hardirq_context);        \
 } while (0)
-# define lockdep_softirq_enter()               \
-do {                                           \
-       current->softirq_context++;             \
-} while (0)
-# define lockdep_softirq_exit()                        \
-do {                                           \
-       current->softirq_context--;             \
-} while (0)
 
 # define lockdep_hrtimer_enter(__hrtimer)              \
 ({                                                     \
@@ -140,6 +132,21 @@ do {                                               \
 # define lockdep_irq_work_exit(__work)         do { } while (0)
 #endif
 
+#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PREEMPT_RT)
+# define lockdep_softirq_enter()               \
+do {                                           \
+       current->softirq_context++;             \
+} while (0)
+# define lockdep_softirq_exit()                        \
+do {                                           \
+       current->softirq_context--;             \
+} while (0)
+
+#else
+# define lockdep_softirq_enter()               do { } while (0)
+# define lockdep_softirq_exit()                        do { } while (0)
+#endif
+
 #if defined(CONFIG_IRQSOFF_TRACER) || \
        defined(CONFIG_PREEMPT_TRACER)
  extern void stop_critical_timings(void);