2004-10-12 00:18:50

by Blaisorblade

[permalink] [raw]
Subject: [patch 2/6] uml: fix warning for unused var


That var is used only when CONFIG_UML_REAL_TIME_CLOCK is on, so #ifdef its
definition.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[email protected]>
---

linux-2.6.9-current-paolo/arch/um/kernel/time_kern.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)

diff -puN arch/um/kernel/time_kern.c~uml-fix-unused-warning arch/um/kernel/time_kern.c
--- linux-2.6.9-current/arch/um/kernel/time_kern.c~uml-fix-unused-warning 2004-10-12 01:05:59.458570536 +0200
+++ linux-2.6.9-current-paolo/arch/um/kernel/time_kern.c 2004-10-12 01:05:59.460570232 +0200
@@ -44,7 +44,9 @@ int timer_irq_inited = 0;

static int first_tick;
static unsigned long long prev_usecs;
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
static long long delta; /* Deviation per interval */
+#endif

#define MILLION 1000000

@@ -60,7 +62,7 @@ void timer_irq(union uml_pt_regs *regs)
}

if(first_tick){
-#if defined(CONFIG_UML_REAL_TIME_CLOCK)
+#ifdef CONFIG_UML_REAL_TIME_CLOCK
/* We've had 1 tick */
unsigned long long usecs = os_usecs();

_