From d4b868fd33d150ef7d46f34eff0c530eaa02be20 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 27 Sep 2006 01:50:42 -0700
Subject: [PATCH] --- yaml --- r: 36188 b: refs/heads/master c:
 c1b4098d4852f823ecf1abb2d369cb1beb902653 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/um/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 41322c8bf72f..d0be63f12375 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db9d988eaa48fa8d64cf3234a301eb9406b91de1
+refs/heads/master: c1b4098d4852f823ecf1abb2d369cb1beb902653
diff --git a/trunk/arch/um/kernel/time.c b/trunk/arch/um/kernel/time.c
index 2454bbd9555d..820affbf3e16 100644
--- a/trunk/arch/um/kernel/time.c
+++ b/trunk/arch/um/kernel/time.c
@@ -95,7 +95,7 @@ irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
 
 	do_timer(regs);
 
-	nsecs = get_time() + local_offset;
+	nsecs = get_time();
 	xtime.tv_sec = nsecs / NSEC_PER_SEC;
 	xtime.tv_nsec = nsecs - xtime.tv_sec * NSEC_PER_SEC;