2 files changed, 9 insertions, 2 deletions

diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index fe562db475e9..7452269bba2a 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -5,7 +5,7 @@
  * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,
  * and David Mosberger.
  *
- * Added Linux support -miguel (weird, eh?, the orignal code was meant
+ * Added Linux support -miguel (weird, eh?, the original code was meant
  * to emulate SunOS).
  */
 
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 45cb7c5286d7..00b393c3a4a0 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -436,7 +436,14 @@ void __init time_init(void)
 
 static inline unsigned long do_gettimeoffset(void)
 {
-        return (*master_l10_counter >> 10) & 0x1fffff;
+        unsigned long val = *master_l10_counter;
+        unsigned long usec = (val >> 10) & 0x1fffff;
+
+        /* Limit hit?  */
+        if (val & 0x80000000)
+                usec += 1000000 / HZ;
+
+        return usec;
 }
 
 /* Ok, my cute asm atomicity trick doesn't work anymore.