diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-30 15:55:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-30 16:09:43 +1000 |
| commit | e0d872d536bb93335d5905b09fe374a163486d43 (patch) | |
| tree | c308e65872d65698095077cbfe36f38aa6da5f6f /include/asm-powerpc | |
| parent | fea23bfefb4e98efd3c36f00ccc0b60281dc99da (diff) | |
| download | kernel-crypto-e0d872d536bb93335d5905b09fe374a163486d43.tar.gz kernel-crypto-e0d872d536bb93335d5905b09fe374a163486d43.tar.xz kernel-crypto-e0d872d536bb93335d5905b09fe374a163486d43.zip | |
[POWERPC] Fix problem with time not advancing on 32-bit platforms
This fixes a problem introduced in 5db9fa9593e2ff69f2b95f9d59229dc4faaa564d.
The last_jiffy per-cpu variable is only 32 bits on 32-bit machines, but it
was being compared with a 64-bit quantity (tb_next_jiffy), which resulted in
time not advancing.
This fixes it by changing last_jiffy to be 64 bits on all platforms. With
this, we no longer need tb_last_stamp as a 32-bit version of tb_last_jiffy,
so this gets rid of tb_last_stamp and we just use tb_last_jiffy instead.
This also fixes a bug when the boot cpu is not online, because using
tb_last_stamp could have caused the wrong timebase origin value to be used
when calculating the time of day.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/time.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h index dcde4410348..5785ac4737b 100644 --- a/include/asm-powerpc/time.h +++ b/include/asm-powerpc/time.h @@ -30,10 +30,6 @@ extern unsigned long tb_ticks_per_usec; extern unsigned long tb_ticks_per_sec; extern u64 tb_to_xs; extern unsigned tb_to_us; -extern unsigned long tb_last_stamp; -extern u64 tb_last_jiffy; - -DECLARE_PER_CPU(unsigned long, last_jiffy); struct rtc_time; extern void to_tm(int tim, struct rtc_time * tm); |