public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lee Revell <rlrevell@joe-job.com>
To: Andrew Morton <akpm@osdl.org>, Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: [PATCH] clean up FIXME in do_timer_interrupt
Date: Thu, 03 Mar 2005 12:10:28 -0500	[thread overview]
Message-ID: <1109869828.2908.18.camel@mindpipe> (raw)

AFAICT this code is equivalent and cleans up the (efi_)set_rtc_mmss code
referred to as "horrible... FIXME" in the comments.  Completely
untested.

Signed-Off-By: Lee Revell <rlrevell@joe-job.com>

--- linux-2.6.11-rc4/arch/i386/kernel/time.c.orig	2005-03-03 11:52:32.000000000 -0500
+++ linux-2.6.11-rc4/arch/i386/kernel/time.c	2005-03-03 12:02:20.000000000 -0500
@@ -254,16 +254,10 @@
 			>= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 &&
 	    (xtime.tv_nsec / 1000)
 			<= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2) {
-		/* horrible...FIXME */
-		if (efi_enabled) {
-	 		if (efi_set_rtc_mmss(xtime.tv_sec) == 0)
-				last_rtc_update = xtime.tv_sec;
-			else
-				last_rtc_update = xtime.tv_sec - 600;
-		} else if (set_rtc_mmss(xtime.tv_sec) == 0)
-			last_rtc_update = xtime.tv_sec;
-		else
-			last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
+	        last_rtc_update = xtime.tv_sec;
+		if (efi_enabled && efi_set_rtc_mmss(xtime.tv_sec) || 
+			set_rtc_mmss(xtime.tv_sec))
+			last_rtc_update -= 600;
 	}
 
 	if (MCA_bus) {



             reply	other threads:[~2005-03-03 17:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-03 17:10 Lee Revell [this message]
2005-03-04  0:45 ` [PATCH] clean up FIXME in do_timer_interrupt Andrew Morton
2005-03-04  1:19   ` Lee Revell
2005-03-04 10:28     ` George Anzinger
2005-03-04 20:43       ` Lee Revell
2005-03-04 20:58         ` George Anzinger
2005-03-08 20:27           ` Lee Revell
2005-03-08 23:23             ` George Anzinger
2005-03-10  8:42               ` George Anzinger
2005-03-11 22:23                 ` Lee Revell
2005-03-11 22:34                   ` Andrew Morton
2005-03-12  2:01                     ` George Anzinger
2005-03-19  9:33                     ` [PATCH] clean up FIXME in do_timer_interrupt-lock fix George Anzinger
2005-03-19 21:21                       ` Andrew Morton
2005-03-19 22:23                         ` George Anzinger

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=1109869828.2908.18.camel@mindpipe \
    --to=rlrevell@joe-job.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /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