2008-02-14 10:04:24

by Shi Weihua

Subject: [PATCH 2.6.24-rt1] timer:fix build warning in timer.c

Fix the following compile warning without CONFIG_PREEMPT_RT:
kernel/timer.c:937: warning: ‘count_active_rt_tasks’ defined but not used

Signed-off-by: Shi Weihua <[email protected]>

---
diff -urpN linux-2.6.24-rt1.orig/kernel/timer.c linux-2.6.24-rt1/kernel/timer.c
--- linux-2.6.24-rt1.orig/kernel/timer.c 2008-02-14 17:01:49.000000000 +0800
+++ linux-2.6.24-rt1/kernel/timer.c 2008-02-14 17:31:10.000000000 +0800
@@ -930,20 +930,18 @@ static unsigned long count_active_tasks(
#endif
}

+#ifdef CONFIG_PREEMPT_RT
/*
* Nr of active tasks - counted in fixed-point numbers
*/
static unsigned long count_active_rt_tasks(void)
{
-#ifdef CONFIG_PREEMPT_RT
extern unsigned long rt_nr_running(void);
extern unsigned long rt_nr_uninterruptible(void);

return (rt_nr_running() + rt_nr_uninterruptible()) * FIXED_1;
-#else
- return 0;
-#endif
}
+#endif

/*
* Hmm.. Changed this, as the GNU make sources (load.c) seems to

2008-02-14 12:44:56

by Steven Rostedt

Subject: Re: [PATCH 2.6.24-rt1] timer:fix build warning in timer.c

On Thu, 14 Feb 2008, Shi Weihua wrote:

> Fix the following compile warning without CONFIG_PREEMPT_RT:
> kernel/timer.c:937: warning: ‘count_active_rt_tasks’ defined but not used
>
> Signed-off-by: Shi Weihua <[email protected]>

Thanks, applied.

-- Steve