aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/time.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-20 08:33:06 -0400
committerPaul Mackerras <paulus@samba.org>2005-10-20 08:33:06 -0400
commit5d14a18d59b661356409e5a1f624236155a209ba (patch)
tree445d21d8b1ec0e58623887f7ceb55c2d3f81f4d5 /include/asm-powerpc/time.h
parent17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (diff)
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 'include/asm-powerpc/time.h')
-rw-r--r--include/asm-powerpc/time.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index 4eecc38f7092..f8ef186c81e4 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -75,7 +75,7 @@ struct div_result {
75/* Accessor functions for the timebase (RTC on 601) registers. */ 75/* Accessor functions for the timebase (RTC on 601) registers. */
76/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */ 76/* If one day CONFIG_POWER is added just define __USE_RTC as 1 */
77#ifdef CONFIG_6xx 77#ifdef CONFIG_6xx
78#define __USE_RTC() cpu_has_feature(CPU_FTR_USE_TB) 78#define __USE_RTC() (!cpu_has_feature(CPU_FTR_USE_TB))
79#else 79#else
80#define __USE_RTC() 0 80#define __USE_RTC() 0
81#endif 81#endif