Date: Fri, 28 Nov 2003 17:34:49 +0100 (CET)
From: Tim Schmielau <tim@physik3.uni-rostock.de>
To: Ricardo Nabinger Sanchez <rnsanchez@terra.com.br>
cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org,
       sisop-iii-l <sisopiii-l@cscience.org>
Subject: Re: [PATCH] fix #endif misplacement
In-Reply-To: <20031128141927.5ff1f35a.rnsanchez@terra.com.br>
Message-ID: <Pine.LNX.4.53.0311281732100.21904@gockel.physik3.uni-rostock.de>
References: <20031128141927.5ff1f35a.rnsanchez@terra.com.br>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1033
Lines: 30

On Fri, 28 Nov 2003, Ricardo Nabinger Sanchez wrote:

> This patch fixes an #endif misplacement, which leads to dead code in
> sched_clock() in arch/i386/kernel/timers/timer_tsc.c, due to a return
> outside the ifdef/endif.

No, this is exactly what is intended: don't use the TSC on NUMA, use 
jiffies instead.
Look at the comment just above those lines.

Tim


> --- linux-2.6.0-test11/arch/i386/kernel/timers/timer_tsc.c	2003-11-26 18:44:45.000000000 -0200
> +++ linux-2.6.0-test11-sched_clock/arch/i386/kernel/timers/timer_tsc.c	2003-11-28 12:58:59.000000000 -0200
> @@ -140,8 +140,8 @@
>  	 */
>  #ifndef CONFIG_NUMA
>  	if (!use_tsc)
> -#endif
>  		return (unsigned long long)jiffies * (1000000000 / HZ);
> +#endif
>  
>  	/* Read the Time Stamp Counter */
>  	rdtscll(this_offset);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/