Re: [PATCH] sched: fix never executed code due to expression always false

[Nick Piggin <nickpiggin@yahoo.com.au>]

Jesper Juhl wrote:

> 
> As per this patch perhaps? : 
> 

Thanks. I'll make sure it gets to the right place if nobody picks it up.

> Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
> 
> --- linux-2.6.12-rc2-mm3-orig/kernel/sched.c	2005-04-11 21:20:56.000000000 +0200
> +++ linux-2.6.12-rc2-mm3/kernel/sched.c	2005-04-15 02:21:34.000000000 +0200
> @@ -2697,9 +2697,10 @@ need_resched_nonpreemptible:
>  	schedstat_inc(rq, sched_cnt);
>  	now = sched_clock();
>  	if (likely((long long)now - prev->timestamp < NS_MAX_SLEEP_AVG)) {
> -		run_time = now - prev->timestamp;
> -		if (unlikely((long long)now - prev->timestamp < 0))
> +		if (unlikely(((long long)now - (long long)prev->timestamp) < 0))
>  			run_time = 0;
> +		else
> +			run_time = now - prev->timestamp;
>  	} else
>  		run_time = NS_MAX_SLEEP_AVG;
>  
> @@ -2776,7 +2777,7 @@ go_idle:
>  
>  	if (!rt_task(next) && next->activated > 0) {
>  		unsigned long long delta = now - next->timestamp;
> -		if (unlikely((long long)now - next->timestamp < 0))
> +		if (unlikely(((long long)now - (long long)next->timestamp) < 0))
>  			delta = 0;
>  
>  		if (next->activated == 1)
> 
> 
> 


-- 
SUSE Labs, Novell Inc.