mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ricardo Nabinger Sanchez <rnsanchez@terra.com.br>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, sisop-iii-l <sisopiii-l@cscience.org>
Subject: [PATCH] fix #endif misplacement
Date: Fri, 28 Nov 2003 14:19:27 -0200	[thread overview]
Message-ID: <20031128141927.5ff1f35a.rnsanchez@terra.com.br> (raw)

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.

Please consider applying, as sched_clock() apparently does not behave as
expected. Patched against 2.6.0-test11.

Regards.

-- 
Ricardo Nabinger Sanchez
GNU/Linux #140696 [http://counter.li.org]
Slackware Linux

  Warning: 
    Trespassers will be shot.
    Survivors will be shot again.



diff -urN linux-2.6.0-test11/arch/i386/kernel/timers/timer_tsc.c
linux-2.6.0-test11-sched_clock/arch/i386/kernel/timers/timer_tsc.c
--- 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:19 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-11-28 16:19 Ricardo Nabinger Sanchez [this message]
2003-11-28 16:34 ` Tim Schmielau
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=20031128141927.5ff1f35a.rnsanchez@terra.com.br \
    --to=rnsanchez@terra.com.br \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --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

all inboxes | Powered by JetHome®