diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/kernel/time.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index 66ba8898db07..0f9213cbd48e 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
@@ -37,7 +37,6 @@ int have_rtc; /* used to remember if we have an RTC or not */; | |||
37 | 37 | ||
38 | #define TICK_SIZE tick | 38 | #define TICK_SIZE tick |
39 | 39 | ||
40 | extern unsigned long wall_jiffies; | ||
41 | extern unsigned long loops_per_jiffy; /* init/main.c */ | 40 | extern unsigned long loops_per_jiffy; /* init/main.c */ |
42 | unsigned long loops_per_usec; | 41 | unsigned long loops_per_usec; |
43 | 42 | ||
@@ -58,11 +57,6 @@ void do_gettimeofday(struct timeval *tv) | |||
58 | local_irq_save(flags); | 57 | local_irq_save(flags); |
59 | local_irq_disable(); | 58 | local_irq_disable(); |
60 | usec = do_gettimeoffset(); | 59 | usec = do_gettimeoffset(); |
61 | { | ||
62 | unsigned long lost = jiffies - wall_jiffies; | ||
63 | if (lost) | ||
64 | usec += lost * (1000000 / HZ); | ||
65 | } | ||
66 | 60 | ||
67 | /* | 61 | /* |
68 | * If time_adjust is negative then NTP is slowing the clock | 62 | * If time_adjust is negative then NTP is slowing the clock |
@@ -103,7 +97,6 @@ int do_settimeofday(struct timespec *tv) | |||
103 | * made, and then undo it! | 97 | * made, and then undo it! |
104 | */ | 98 | */ |
105 | nsec -= do_gettimeoffset() * NSEC_PER_USEC; | 99 | nsec -= do_gettimeoffset() * NSEC_PER_USEC; |
106 | nsec -= (jiffies - wall_jiffies) * TICK_NSEC; | ||
107 | 100 | ||
108 | wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); | 101 | wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec); |
109 | wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); | 102 | wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec); |