[PATCH -rt] compile error on interrupt off timing

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Signed-Off-By: Daniel Walker <[email protected]>

---
 kernel/latency_trace.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Index: linux-2.6.19/kernel/latency_trace.c
===================================================================
--- linux-2.6.19.orig/kernel/latency_trace.c
+++ 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 */
 
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux