[PATCH] Fix compilation of 2.6.23rc4-rt1 without CONFIG_PREEMPT_RT

[PATCH] Fix compilation of 2.6.23rc4-rt1 without CONFIG_PREEMPT_RT

[Andi Kleen]

count_active_rt_tasks() is undefined otherwise.

Signed-off-by: Andi Kleen <ak@suse.de>

Index: linux-2.6.23-rc4-rt1/kernel/timer.c
===================================================================
--- linux-2.6.23-rc4-rt1.orig/kernel/timer.c
+++ linux-2.6.23-rc4-rt1/kernel/timer.c
@@ -919,18 +919,20 @@ 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
+}
 
 /*
  * Hmm.. Changed this, as the GNU make sources (load.c) seems to

Re: [PATCH] Fix compilation of 2.6.23rc4-rt1 without CONFIG_PREEMPT_RT

[Sven-Thorsten Dietrich]

On Mon, 2007-09-17 at 17:52 +0200, Andi Kleen wrote:
> count_active_rt_tasks() is undefined otherwise.
> 

This does fix the compile issue, but RT tasks can exist in !PREEMPT_RT
as well.

Sven

> Signed-off-by: Andi Kleen <ak@suse.de>
> 
> Index: linux-2.6.23-rc4-rt1/kernel/timer.c
> ===================================================================
> --- linux-2.6.23-rc4-rt1.orig/kernel/timer.c
> +++ linux-2.6.23-rc4-rt1/kernel/timer.c
> @@ -919,18 +919,20 @@ 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
> +}
>  
>  /*
>   * Hmm.. Changed this, as the GNU make sources (load.c) seems to
> -
> To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
Sven-Thorsten Dietrich
+1 (415) 694-2930

Re: [PATCH] Fix compilation of 2.6.23rc4-rt1 without CONFIG_PREEMPT_RT

[Andi Kleen]

On Monday 17 September 2007 18:02:54 Sven-Thorsten Dietrich wrote:
> On Mon, 2007-09-17 at 17:52 +0200, Andi Kleen wrote:
> > count_active_rt_tasks() is undefined otherwise.
> > 
> 
> This does fix the compile issue, but RT tasks can exist in !PREEMPT_RT
> as well.

That might be, but neither rt_nr_running nor rt_nr_uninterruptible
exist in a !PREEMPT_RT kernel. So they are presumably managed in a different way.

-Andi

Re: [PATCH] Fix compilation of 2.6.23rc4-rt1 without CONFIG_PREEMPT_RT

[Daniel Walker]

On Mon, 2007-09-17 at 18:27 +0200, Andi Kleen wrote:
> On Monday 17 September 2007 18:02:54 Sven-Thorsten Dietrich wrote:
> > On Mon, 2007-09-17 at 17:52 +0200, Andi Kleen wrote:
> > > count_active_rt_tasks() is undefined otherwise.
> > > 
> > 
> > This does fix the compile issue, but RT tasks can exist in !PREEMPT_RT
> > as well.
> 
> That might be, but neither rt_nr_running nor rt_nr_uninterruptible
> exist in a !PREEMPT_RT kernel. So they are presumably managed in a different way.

I think this is the 3rd or 4th fix for this same issue .. It's too bad
the -rt tree doesn't get updated more frequently ..

Daniel