[PATCH -rt 0/6] misc. ARM fixup and compile fixes

[PATCH -rt 0/6] misc. ARM fixup and compile fixes

[Kevin Hilman]

Thomas, Ingo,

Here's a handful of small fixes for -rt3.  They are either ARM-related
fixups or compile fixes for various .config combinations.

The first couple I already reported, but here they're all together.

Kevin

--

[PATCH -rt 1/6] Re-add GENERIC_TIME to OMAP

[Kevin Hilman]

[-- Attachment #1: omap-fix.patch --]
[-- Type: text/plain, Size: 408 bytes --]

Signed-off-by: Kevin Hilman <khilman@mvista.com>
---
Index: linux-2.6/arch/arm/Kconfig
===================================================================
--- linux-2.6.orig/arch/arm/Kconfig
+++ linux-2.6/arch/arm/Kconfig
@@ -394,6 +394,7 @@ config ARCH_DAVINCI
 config ARCH_OMAP
 	bool "TI OMAP"
 	select GENERIC_GPIO
+	select GENERIC_TIME
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 

--

[PATCH -rt 2/6] Fix typo in new IRQF_TIMER name

[Kevin Hilman]

[-- Attachment #1: irqf-timer.patch --]
[-- Type: text/plain, Size: 637 bytes --]

Signed-off-by: Kevin Hilman <khilman@mvista.com>
---
 include/linux/interrupt.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/include/linux/interrupt.h
===================================================================
--- linux-2.6.orig/include/linux/interrupt.h
+++ linux-2.6/include/linux/interrupt.h
@@ -52,7 +52,7 @@
 #define IRQF_SAMPLE_RANDOM	0x00000040
 #define IRQF_SHARED		0x00000080
 #define IRQF_PROBE_SHARED	0x00000100
-#define _IRQF_TIMER		0x00000200
+#define __IRQF_TIMER		0x00000200
 #define IRQF_PERCPU		0x00000400
 #define IRQF_NOBALANCING	0x00000800
 #define IRQF_IRQPOLL		0x00001000

--

[PATCH -rt 3/6] Compile fix for PREEMPT_TIMING on and TRACE_IRQFLAGS off

[Kevin Hilman]

[-- Attachment #1: latency-trace-fix.patch --]
[-- Type: text/plain, Size: 811 bytes --]

Fix compile of latency_trace.c in the case where
CRITICAL_PREEMPT_TIMING=y and TRACE_IRQFLAGS=n (because DEBUG_KERNEL
is disabled)

Signed-off-by: Kevin Hilman <khilman@mvista.com>
---
 kernel/latency_trace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.21/kernel/latency_trace.c
===================================================================
--- linux-2.6.21.orig/kernel/latency_trace.c
+++ linux-2.6.21/kernel/latency_trace.c
@@ -2151,7 +2151,7 @@ void notrace unmask_preempt_count(unsign
 }
 EXPORT_SYMBOL(unmask_preempt_count);
 
-#ifdef CONFIG_CRITICAL_PREEMPT_TIMING
+#if defined(CONFIG_CRITICAL_PREEMPT_TIMING) && defined(CONFIG_TRACE_IRQFLAGS)
 
 /* Some archs do their cpu_idle with preemption on. Don't measure it */
 void notrace trace_preempt_enter_idle(void)

--

[PATCH -rt 4/6] Add trace_preempt_*_idle() support for ARM.

[Kevin Hilman]

[-- Attachment #1: arm-trace-preempt-idle.patch --]
[-- Type: text/plain, Size: 872 bytes --]

Add trace functions to ARM idle loop and also move the
tick_nohz_restart_sched_tick() after the local_irq_disable() as is
done on x86.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
---
 arch/arm/kernel/process.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/arm/kernel/process.c
===================================================================
--- linux-2.6.orig/arch/arm/kernel/process.c
+++ linux-2.6/arch/arm/kernel/process.c
@@ -165,11 +165,13 @@ void cpu_idle(void)
 		while (!need_resched() && !need_resched_delayed())
 			idle();
 		leds_event(led_idle_end);
-		tick_nohz_restart_sched_tick();
 		local_irq_disable();
+		trace_preempt_exit_idle();
+		tick_nohz_restart_sched_tick();
 		__preempt_enable_no_resched();
 		__schedule();
 		preempt_disable();
+		trace_preempt_enter_idle();
 		local_irq_enable();
 	}
 }

--

[PATCH -rt 5/6] ARM: Fix save_stack_trace() prototype

[Kevin Hilman]

[-- Attachment #1: arm-stacktrace.patch --]
[-- Type: text/plain, Size: 547 bytes --]

Signed-off-by: Kevin Hilman <khilman@mvista.com>
---
 arch/arm/lib/stacktrace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/arch/arm/lib/stacktrace.c
===================================================================
--- linux-2.6.orig/arch/arm/lib/stacktrace.c
+++ linux-2.6/arch/arm/lib/stacktrace.c
@@ -1,7 +1,7 @@
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
 
-void save_stack_trace(struct stack_trace *trace, struct task_struct *task)
+void save_stack_trace(struct stack_trace *trace)
 {
 }
 

--

[PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and IRQSOFF_TIMING off

[Kevin Hilman]

[-- Attachment #1: trace-cpu-idle.patch --]
[-- Type: text/plain, Size: 865 bytes --]

The per-cpu trace_cpu_idle variable is used when timing *either*
IRQs-off or preempt sections.

---
 kernel/latency_trace.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6/kernel/latency_trace.c
===================================================================
--- linux-2.6.orig/kernel/latency_trace.c
+++ linux-2.6/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)
+   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

--

Re: [PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and IRQSOFF_TIMING off

[Sven-Thorsten Dietrich]

On Fri, 2007-07-13 at 10:52 -0700, Kevin Hilman wrote:
> plain text document attachment (trace-cpu-idle.patch)
> 
> The per-cpu trace_cpu_idle variable is used when timing *either*
> IRQs-off or preempt sections.
> 

This also applies to 2.6.22-rt*

Acked-by: Sven-Thorsten Dietrich <sven@thebigcorporation.com>

Re: [PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and IRQSOFF_TIMING off

[Kevin Hilman]

[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 <khilman@mvista.com>
---
 kernel/latency_trace.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6/kernel/latency_trace.c
===================================================================
--- linux-2.6.orig/kernel/latency_trace.c
+++ linux-2.6/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

Re: [PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and IRQSOFF_TIMING off

[Sven-Thorsten Dietrich]

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 <sven@thebigcorporation.com>

>From linux-rt-users-owner@vger.kernel.org Fri Jul 13 16:22:34 2007
Return-Path: <linux-rt-users-owner@vger.kernel.org>
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
	<sven@thebigcorporation.com>; Fri, 13 Jul 2007 16:22:33 -0700
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id
	S1759195AbXGMXW1 (ORCPT <rfc822;sven@thebigcorporation.com>); Fri, 13 Jul
	2007 19:22:27 -0400
Received: (majordomo@vger.kernel.org) 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;linux-rt-users@vger.kernel.org>);
	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: <46980935.3060509@mvista.com>
Date:	Fri, 13 Jul 2007 16:22:29 -0700
From: Kevin Hilman <khilman@mvista.com>
User-Agent: Thunderbird 1.5.0.12 (X11/20070604)
MIME-Version: 1.0
To: Kevin Hilman <khilman@mvista.com>
Cc: tglx@linutronix.de, mingo@elte.hu, linux-rt-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH -rt 6/6] Compile fix for PREEMPT_TIMING on and
	IRQSOFF_TIMING off
References: <20070713175214.336577416@mvista.com>
	 <20070713175229.239602308@mvista.com>
In-Reply-To: <20070713175229.239602308@mvista.com>
Content-Type: text/plain; charset=ISO-8859-1
Sender: linux-rt-users-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List:	linux-rt-users@vger.kernel.org
X-Evolution-Source: imap://sven@sx.thebigcorporation.com/
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 <khilman@mvista.com>
---
 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

Re: [PATCH -rt 0/6] misc. ARM fixup and compile fixes

[Thomas Gleixner]

On Fri, 2007-07-13 at 10:52 -0700, Kevin Hilman wrote:
> Thomas, Ingo,
> 
> Here's a handful of small fixes for -rt3.  They are either ARM-related
> fixups or compile fixes for various .config combinations.
> 
> The first couple I already reported, but here they're all together.

Kevin, please check your mailer, editor or whatever involved. Most of
your patches are white space damaged. Fixed them up manually.

	tglx