aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 6996a593dcb3..a6282b625b44 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -61,6 +61,7 @@
61#include <asm/prom.h> 61#include <asm/prom.h>
62#include <asm/irq.h> 62#include <asm/irq.h>
63#include <asm/div64.h> 63#include <asm/div64.h>
64#include <asm/smp.h>
64#ifdef CONFIG_PPC64 65#ifdef CONFIG_PPC64
65#include <asm/systemcfg.h> 66#include <asm/systemcfg.h>
66#include <asm/firmware.h> 67#include <asm/firmware.h>
@@ -69,6 +70,7 @@
69#include <asm/iseries/it_lp_queue.h> 70#include <asm/iseries/it_lp_queue.h>
70#include <asm/iseries/hv_call_xm.h> 71#include <asm/iseries/hv_call_xm.h>
71#endif 72#endif
73#include <asm/smp.h>
72 74
73/* keep track of when we need to update the rtc */ 75/* keep track of when we need to update the rtc */
74time_t last_rtc_update; 76time_t last_rtc_update;
@@ -118,10 +120,6 @@ static unsigned adjusting_time = 0;
118unsigned long ppc_proc_freq; 120unsigned long ppc_proc_freq;
119unsigned long ppc_tb_freq; 121unsigned long ppc_tb_freq;
120 122
121#ifdef CONFIG_PPC32 /* XXX for now */
122#define boot_cpuid 0
123#endif
124
125u64 tb_last_jiffy __cacheline_aligned_in_smp; 123u64 tb_last_jiffy __cacheline_aligned_in_smp;
126unsigned long tb_last_stamp; 124unsigned long tb_last_stamp;
127 125