aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-06 21:18:13 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-06 21:18:13 -0500
commit2249ca9d60d3a8a1f6f223f0f0a0283fcb7ce33e (patch)
tree33a5c8d6e2363013db1052f474c1225c472e3fcd /arch/powerpc/kernel/time.c
parentdcad47fc423ac9f4934579af814fa2dad5c8081b (diff)
powerpc: Various UP build fixes
Mostly this involves adding #include <asm/smp.h>, since that defines things like boot_cpuid[_phys] and [gs]et_hard_smp_processor_id, which are SMP-related but still needed on UP. This incorporates fixes posted by Olof Johansson and Heikki Lindholm. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 6996a593dcb3..1c7ea5e06311 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>
@@ -118,10 +119,6 @@ static unsigned adjusting_time = 0;
118unsigned long ppc_proc_freq; 119unsigned long ppc_proc_freq;
119unsigned long ppc_tb_freq; 120unsigned long ppc_tb_freq;
120 121
121#ifdef CONFIG_PPC32 /* XXX for now */
122#define boot_cpuid 0
123#endif
124
125u64 tb_last_jiffy __cacheline_aligned_in_smp; 122u64 tb_last_jiffy __cacheline_aligned_in_smp;
126unsigned long tb_last_stamp; 123unsigned long tb_last_stamp;
127 124