mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [patch -mm] s390: fix do_gettimeoffset
@ 2006-08-28 13:34 Heiko Carstens
  2006-08-28 13:44 ` Atsushi Nemoto
  0 siblings, 1 reply; 2+ messages in thread
From: Heiko Carstens @ 2006-08-28 13:34 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Atsushi Nemoto, Martin Schwidefsky, linux-kernel

From: Heiko Carstens <heiko.carstens@de.ibm.com>

kill-wall_jiffies.patch breaks s390's do_gettimeoffset(). Fix this and do a
small whitespace cleanup while we are at it.

Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---

 arch/s390/kernel/time.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.18-rc4-mm3/arch/s390/kernel/time.c
===================================================================
--- linux-2.6.18-rc4-mm3.orig/arch/s390/kernel/time.c	2006-08-28 10:32:45.000000000 +0200
+++ linux-2.6.18-rc4-mm3/arch/s390/kernel/time.c	2006-08-28 10:42:33.000000000 +0200
@@ -85,7 +85,8 @@
 {
 	__u64 now;
 
-        now = (get_clock() - jiffies_timer_cc) >> 12;
+	now = (get_clock() - jiffies_timer_cc) >> 12;
+	now -= (__u64) jiffies * USECS_PER_JIFFY;
 	return (unsigned long) now;
 }
 

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch -mm] s390: fix do_gettimeoffset
  2006-08-28 13:34 [patch -mm] s390: fix do_gettimeoffset Heiko Carstens
@ 2006-08-28 13:44 ` Atsushi Nemoto
  0 siblings, 0 replies; 2+ messages in thread
From: Atsushi Nemoto @ 2006-08-28 13:44 UTC (permalink / raw)
  To: heiko.carstens; +Cc: akpm, schwidefsky, linux-kernel

On Mon, 28 Aug 2006 15:34:56 +0200, Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
> kill-wall_jiffies.patch breaks s390's do_gettimeoffset(). Fix this and do a
> small whitespace cleanup while we are at it.

Oops, my fault.  Thank you for fixing it.

---
Atsushi Nemoto

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-08-28 13:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-08-28 13:34 [patch -mm] s390: fix do_gettimeoffset Heiko Carstens
2006-08-28 13:44 ` Atsushi Nemoto

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®