---

yaml --- r: 36188 b: refs/heads/master c: c1b4098 h: refs/heads/master v: v3
git-mirror · Sep 27, 2006 · d4b868f · d4b868f
1 parent cc1c373
commit d4b868f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;