summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-20 22:33:06 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-20 22:33:06 +1000
commit5d14a18d59b661356409e5a1f624236155a209ba (patch)
tree445d21d8b1ec0e58623887f7ceb55c2d3f81f4d5 /arch/powerpc/kernel/time.c
parent17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (diff)
downloadop-kernel-dev-5d14a18d59b661356409e5a1f624236155a209ba.zip
op-kernel-dev-5d14a18d59b661356409e5a1f624236155a209ba.tar.gz
powerpc: Fix some bugs in the new merged time code
I had the sense of the test for when to use the old 601-style RTC registers inverted. pmac_calibrate_decr and via_calibrate_decr weren't setting ppc_tb_freq, on which all the further calculations depended. Lastly, update_gtod was losing the top 32 bits of the new tb_to_xs value. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 7d406b7..3e72237 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -222,7 +222,7 @@ static inline void timer_sync_xtime(unsigned long cur_tb)
* between updates.
*/
static inline void update_gtod(u64 new_tb_stamp, u64 new_stamp_xsec,
- unsigned int new_tb_to_xs)
+ u64 new_tb_to_xs)
{
unsigned temp_idx;
struct gettimeofday_vars *temp_varp;
OpenPOWER on IntegriCloud