diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-30 16:13:16 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 21:21:55 -0700 |
| commit | eb36c2884a1a2190791afe65fd833b2d3cd4b999 (patch) | |
| tree | 2bc7defdfee59f273e81a5ddd2e792c65bb93d4c /include | |
| parent | 98a3c781057fa43494e7e8b39d639e93fca0ecbf (diff) | |
| download | linux-3.10-eb36c2884a1a2190791afe65fd833b2d3cd4b999.tar.gz linux-3.10-eb36c2884a1a2190791afe65fd833b2d3cd4b999.tar.bz2 linux-3.10-eb36c2884a1a2190791afe65fd833b2d3cd4b999.zip | |
[PATCH] ppc32: fix last_jiffy time comparison
This fixes a hang on ppc32.
The problem was that I was comparing a 32-bit quantity with a 64-bit
quantity, and consequently time wasn't advancing. This makes us use a
64-bit quantity on all platforms, which ends up simplifying the code
since we can now get rid of the tb_last_stamp variable (which actually
fixes another bug that Ben H and I noticed while going carefully through
the code).
This works fine on my G4 tibook. Let me know how it goes on your
machines.
Acked-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -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); |