diff options
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/time.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index abab42e9f5f8..4bf66cc4a267 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -53,8 +53,6 @@ static u64 init_timer_cc; | |||
53 | static u64 jiffies_timer_cc; | 53 | static u64 jiffies_timer_cc; |
54 | static u64 xtime_cc; | 54 | static u64 xtime_cc; |
55 | 55 | ||
56 | extern unsigned long wall_jiffies; | ||
57 | |||
58 | /* | 56 | /* |
59 | * Scheduler clock - returns current time in nanosec units. | 57 | * Scheduler clock - returns current time in nanosec units. |
60 | */ | 58 | */ |
@@ -87,9 +85,8 @@ static inline unsigned long do_gettimeoffset(void) | |||
87 | { | 85 | { |
88 | __u64 now; | 86 | __u64 now; |
89 | 87 | ||
90 | now = (get_clock() - jiffies_timer_cc) >> 12; | 88 | now = (get_clock() - jiffies_timer_cc) >> 12; |
91 | /* We require the offset from the latest update of xtime */ | 89 | now -= (__u64) jiffies * USECS_PER_JIFFY; |
92 | now -= (__u64) wall_jiffies*USECS_PER_JIFFY; | ||
93 | return (unsigned long) now; | 90 | return (unsigned long) now; |
94 | } | 91 | } |
95 | 92 | ||