linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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
Date: Fri, 28 Nov 2003 17:34:49 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.53.0311281732100.21904@gockel.physik3.uni-rostock.de> (raw)
In-Reply-To: <20031128141927.5ff1f35a.rnsanchez@terra.com.br>

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);

  reply	other threads:[~2003-11-28 16:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-28 16:19 [PATCH] fix #endif misplacement Ricardo Nabinger Sanchez
2003-11-28 16:34 ` Tim Schmielau [this message]
2003-11-28 16:39   ` [SisopIII-l] " Felipe W Damasio
2003-11-28 16:59     ` Lucas Correia Villa Real
2003-11-28 17:05     ` Nick Piggin
2003-11-28 17:12       ` Felipe W Damasio
2003-11-28 21:15         ` Ricardo Nabinger Sanchez
2003-11-28 17:29   ` [patch] " Tim Schmielau
2003-11-28 18:29     ` [patch] another jiffies wrap bug Tim Schmielau
2003-11-28 21:35   ` [PATCH] fix #endif misplacement Ricardo Nabinger Sanchez
2003-11-28 22:24     ` [SisopIII-l] " Lucas Correia Villa Real

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.53.0311281732100.21904@gockel.physik3.uni-rostock.de \
    --to=tim@physik3.uni-rostock.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rnsanchez@terra.com.br \
    --cc=sisopiii-l@cscience.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).