On Fri, 2007-07-13 at 16:22 -0700, Kevin Hilman wrote:
> [Minor update to avoid a compiler warning in the case of DEBUG_KERNEL=n]
>
The resent patch (v2) had white space damage -
Here is a reconstituted version that applies for me on 2.6.22-rt3
Acked-by: Sven-Thorsten Dietrich <[EMAIL PROTECTED]>
>From [EMAIL PROTECTED] Fri Jul 13 16:22:34 2007
Return-Path: <[EMAIL PROTECTED]>
Received: from sx.thebigcorporation.com ([unix socket]) by
sx.thebigcorporation.com (Cyrus v2.3.8-Fedora-RPM-2.3.8-3.fc7) with
LMTPA;
Fri, 13 Jul 2007 16:22:34 -0700
X-Sieve: CMU Sieve 2.3
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by
sx.thebigcorporation.com (8.14.1/8.13.8) with ESMTP id l6DNMXP6017382
for
<[EMAIL PROTECTED]>; Fri, 13 Jul 2007 16:22:33 -0700
Received: ([EMAIL PROTECTED]) by vger.kernel.org via listexpand id
S1759195AbXGMXW1 (ORCPT <rfc822;[EMAIL PROTECTED]>); Fri, 13 Jul
2007 19:22:27 -0400
Received: ([EMAIL PROTECTED]) by vger.kernel.org id
S1760623AbXGMXW1 (ORCPT <rfc822;linux-rt-users-outgoing>); Fri, 13 Jul
2007
19:22:27 -0400
Received: from h155.mvista.com ([63.81.120.158]:7301 "EHLO
gateway-1237.mvista.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org
with
ESMTP id S1759161AbXGMXW1 (ORCPT <rfc822;[EMAIL PROTECTED]>);
Fri, 13 Jul 2007 19:22:27 -0400
Received: from [127.0.0.1] (asshur.mvista.com [10.0.0.11]) by
hermes.mvista.com (Postfix) with ESMTP id 69F871DE39; Fri, 13 Jul 2007
16:22:25 -0700 (PDT)
Message-ID: <[EMAIL PROTECTED]>
Date: Fri, 13 Jul 2007 16:22:29 -0700
From: Kevin Hilman <[EMAIL PROTECTED]>
User-Agent: Thunderbird 1.5.0.12 (X11/20070604)
MIME-Version: 1.0
To: Kevin Hilman <[EMAIL PROTECTED]>
Cc: [EMAIL PROTECTED], [EMAIL PROTECTED], [EMAIL PROTECTED],
linux-kernel@vger.kernel.org
Subject: Re: [PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and
IRQSOFF_TIMING off
References: <[EMAIL PROTECTED]>
<[EMAIL PROTECTED]>
In-Reply-To: <[EMAIL PROTECTED]>
Content-Type: text/plain; charset=ISO-8859-1
Sender: [EMAIL PROTECTED]
Precedence: bulk
X-Mailing-List: [EMAIL PROTECTED]
X-Evolution-Source: imap://[EMAIL PROTECTED]/
Content-Transfer-Encoding: 8bit
[Minor update to avoid a compiler warning in the case of DEBUG_KERNEL=n]
Compile fix for PREEMPT_TIMING on and IRQSOFF_TIMING off
The per-cpu trace_cpu_idle variable is used when timing *either*
IRQs-off or preempt sections.
Signed-off-by: Kevin Hilman <[EMAIL PROTECTED]>
---
kernel/latency_trace.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: linux-2.6.22/kernel/latency_trace.c
===================================================================
--- linux-2.6.22.orig/kernel/latency_trace.c
+++ linux-2.6.22/kernel/latency_trace.c
@@ -85,9 +85,13 @@ static inline int DEBUG_WARN_ON(int cond
}
#endif
+#if defined(CONFIG_CRITICAL_IRQSOFF_TIMING) || \
+ (defined(CONFIG_CRITICAL_PREEMPT_TIMING) && defined(CONFIG_TRACE_IRQFLAGS))
+ static DEFINE_PER_CPU(int, trace_cpu_idle);
+#endif
+
#ifdef CONFIG_CRITICAL_IRQSOFF_TIMING
# ifdef CONFIG_CRITICAL_PREEMPT_TIMING
- static DEFINE_PER_CPU(int, trace_cpu_idle);
# define irqs_off_preempt_count() (preempt_count() &&
!__get_cpu_var(trace_cpu_idle))
# else
# define irqs_off_preempt_count() 0
-
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/
