Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / parisc / kernel / time.c

diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 9d642d820fe9f35b227960baafd7f3626e579b7c..b3496b592a2d7db687793899388a4db9ce73f064 100644 (file)
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -215,9 +215,6 @@ static inline unsigned long gettimeoffset (void)
 
        /* FIXME: Can we improve the precision? Not with PAGE0. */
        usec = (elapsed_cycles * 10000) / PAGE0->mem_10msec;
-
-       /* add in "lost" jiffies */
-       usec += cpt * (jiffies - wall_jiffies);
        return usec;
 #else
        return 0;