Re: 2.6.24-rc7-rt1

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Steven Rostedt <rostedt@...>
Cc: LKML <linux-kernel@...>, RT <linux-rt-users@...>, Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>
Date: Sunday, January 13, 2008 - 4:43 pm

Hello,


  CC      kernel/lockdep.o
kernel/lockdep.c: In function 'trace_hardirqs_on':
kernel/lockdep.c:2068: error: too many arguments to function 'trace_hardirqs_on_caller'
make[1]: *** [kernel/lockdep.o] Error 1
make: *** [kernel] Error 2

--- linux-2.6.24-rc7-rt1.orig/kernel/lockdep.c  2008-01-11 21:16:46.000000000 -0500
+++ linux-2.6.24-rc7-rt1/kernel/lockdep.c       2008-01-11 21:18:10.000000000 -0500

[... snip ...]

 /*
  * Hardirqs will be enabled:
  */
-void trace_hardirqs_on(void)
+notrace void trace_hardirqs_on_caller(void) <--- this should have 'unsigned long a0'
 {
        struct task_struct *curr = current;
        unsigned long ip;
@@ -2050,6 +2059,13 @@ void trace_hardirqs_on(void)
        curr->hardirq_enable_ip = ip;
        curr->hardirq_enable_event = ++curr->irq_events;
        debug_atomic_inc(&hardirqs_on_events);
+#ifdef CONFIG_CRITICAL_IRQSOFF_TIMING
+       time_hardirqs_on(a0, 0 /* CALLER_ADDR1 */); <--- a0 is used here
+#endif
+}
+
+void notrace trace_hardirqs_on(void) {
+       trace_hardirqs_on_caller(CALLER_ADDR0);
 }

But then there is also trace_hardirqs_on_caller() in kernel/latency_trace.c 
and both are not static.

Regards,

	Mariusz
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.24-rc7-rt1, Steven Rostedt, (Sun Jan 13, 3:00 pm)
Re: 2.6.24-rc7-rt1, Mark Knecht, (Sun Jan 13, 6:56 pm)
Re: 2.6.24-rc7-rt1, Mariusz Kozlowski, (Sun Jan 13, 4:43 pm)
Re: 2.6.24-rc7-rt1, Steven Rostedt, (Sun Jan 13, 4:54 pm)
Re: 2.6.24-rc7-rt1, Mike Galbraith, (Mon Jan 14, 4:27 am)
Re: 2.6.24-rc7-rt1, S.Çağlar, (Mon Jan 14, 2:39 pm)
Re: 2.6.24-rc7-rt1, Steven Rostedt, (Mon Jan 14, 12:52 pm)
Re: 2.6.24-rc7-rt1, Gregory Haskins, (Mon Jan 14, 8:13 am)
Re: 2.6.24-rc7-rt1, Mike Galbraith, (Mon Jan 14, 9:25 am)
Re: 2.6.24-rc7-rt1, Mike Galbraith, (Tue Jan 15, 4:07 am)
Re: 2.6.24-rc7-rt1, Mike Galbraith, (Tue Jan 15, 5:28 am)
Re: 2.6.24-rc7-rt1, Gregory Haskins, (Tue Jan 15, 12:50 pm)
Re: 2.6.24-rc7-rt1, Mike Galbraith, (Mon Jan 14, 10:29 am)
Re: 2.6.24-rc7-rt1, Robert Schwebel, (Sun Jan 13, 4:25 pm)
Re: 2.6.24-rc7-rt1, Steven Rostedt, (Sun Jan 13, 4:48 pm)
Re: 2.6.24-rc7-rt1, Robert Schwebel, (Mon Jan 14, 3:49 pm)
Re: 2.6.24-rc7-rt1: macro "put_cpu_var" passed 2 arguments, ..., Mariusz Kozlowski, (Sun Jan 13, 3:53 pm)