aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/time.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-30 21:57:01 -0500
committerPaul Mackerras <paulus@samba.org>2005-10-30 21:57:01 -0500
commit734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch)
tree507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/time.c
parent23fd07750a789a66fe88cf173d52a18f1a387da4 (diff)
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
-rw-r--r--arch/powerpc/kernel/time.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index ed5c38fb146c..23436b6c1881 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -70,10 +70,6 @@
70#include <asm/iSeries/HvCallXm.h> 70#include <asm/iSeries/HvCallXm.h>
71#endif 71#endif
72 72
73u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
74
75EXPORT_SYMBOL(jiffies_64);
76
77/* keep track of when we need to update the rtc */ 73/* keep track of when we need to update the rtc */
78time_t last_rtc_update; 74time_t last_rtc_update;
79extern int piranha_simulator; 75extern int piranha_simulator;