Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754803AbYAMUnr (ORCPT ); Sun, 13 Jan 2008 15:43:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753839AbYAMUni (ORCPT ); Sun, 13 Jan 2008 15:43:38 -0500 Received: from xdsl-664.zgora.dialog.net.pl ([81.168.226.152]:3365 "EHLO tuxland.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753364AbYAMUnh (ORCPT ); Sun, 13 Jan 2008 15:43:37 -0500 From: Mariusz Kozlowski To: Steven Rostedt Subject: Re: 2.6.24-rc7-rt1 Date: Sun, 13 Jan 2008 21:43:32 +0100 User-Agent: KMail/1.9.7 Cc: LKML , RT , Ingo Molnar , Thomas Gleixner References: <1200250801.9190.7.camel@localhost.localdomain> In-Reply-To: <1200250801.9190.7.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200801132143.34889.m.kozlowski@tuxland.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1574 Lines: 50 Hello, > We are pleased to announce the 2.6.24-rc7-rt1 tree, which can be > downloaded from the location: > > http://rt.et.redhat.com/download/ 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/