Skip to contentSkip to conversation

compile error on interrupt off timing

PATCH New Daniel Walker 1 participant 1 message Dec 10, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 compile error on interrupt off timing

I found a compile error with lockdep off, and interrupt off timing on. Fixed below, and I also fixed the ifdef comments.

---
 kernel/latency_trace.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
kernel/latency_trace.c +6 -2
Index: linux-2.6.19/kernel/latency_trace.c
===================================================================
@@ -1886,7 +1886,7 @@ void notrace time_hardirqs_off(unsigned 
 		__start_critical_timing(a0, a1, INTERRUPT_LATENCY);
 }
 
-#else /* !CONFIG_TRACE_IRQFLAGS */
+#else /* !CONFIG_LOCKDEP */
 
 /*
  * Dummy:
@@ -1908,6 +1908,10 @@ void trace_softirqs_off(unsigned long ip
 {
 }
 
+inline void print_irqtrace_events(struct task_struct *curr)
+{
+}
+
 /*
  * We are only interested in hardirq on/off events:
  */
@@ -1935,7 +1939,7 @@ void notrace trace_hardirqs_off(void)
 
 EXPORT_SYMBOL(trace_hardirqs_off);
 
-#endif /* CONFIG_TRACE_IRQFLAGS */
+#endif /* !CONFIG_LOCKDEP */
 
 #endif /* CONFIG_CRITICAL_IRQSOFF_TIMING */
 

--