diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 742f07a63161..7dd5dab789a1 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
@@ -102,7 +102,7 @@ EXPORT_SYMBOL(tb_ticks_per_sec); /* for cputime_t conversions */ | |||
102 | u64 tb_to_xs; | 102 | u64 tb_to_xs; |
103 | unsigned tb_to_us; | 103 | unsigned tb_to_us; |
104 | 104 | ||
105 | #define TICKLEN_SCALE (SHIFT_SCALE - 10) | 105 | #define TICKLEN_SCALE TICK_LENGTH_SHIFT |
106 | u64 last_tick_len; /* units are ns / 2^TICKLEN_SCALE */ | 106 | u64 last_tick_len; /* units are ns / 2^TICKLEN_SCALE */ |
107 | u64 ticklen_to_xs; /* 0.64 fraction */ | 107 | u64 ticklen_to_xs; /* 0.64 fraction */ |
108 | 108 | ||
@@ -534,7 +534,7 @@ static __inline__ void timer_recalc_offset(u64 cur_tb) | |||
534 | 534 | ||
535 | if (__USE_RTC()) | 535 | if (__USE_RTC()) |
536 | return; | 536 | return; |
537 | tlen = current_tick_length(SHIFT_SCALE - 10); | 537 | tlen = current_tick_length(); |
538 | offset = cur_tb - do_gtod.varp->tb_orig_stamp; | 538 | offset = cur_tb - do_gtod.varp->tb_orig_stamp; |
539 | if (tlen == last_tick_len && offset < 0x80000000u) | 539 | if (tlen == last_tick_len && offset < 0x80000000u) |
540 | return; | 540 | return; |