aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/time_32.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 10:07:40 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 03:35:46 -0400
commit454ede7eebf91b92ab1eafe10c6b6ed04de29bf8 (patch)
treeeac4f80f71d1f545c75db80810ff27a53ebcd8c1 /arch/x86/kernel/time_32.c
parent0be6939422eb2f54df4b3d8763c569c6759c1a42 (diff)
x86: Make timer setup and global variables the same in time_32/64.c
The timer and timer irq setup code is identical in 32 and 64 bit. Make it the same formatting as well. Also add the global variables under the necessary ifdefs to both files. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/time_32.c')
-rw-r--r--arch/x86/kernel/time_32.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index ec729cdcfa3d..186abc577b2b 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -27,6 +27,10 @@
27int timer_ack; 27int timer_ack;
28#endif 28#endif
29 29
30#ifdef CONFIG_X86_64
31volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
32#endif
33
30unsigned long profile_pc(struct pt_regs *regs) 34unsigned long profile_pc(struct pt_regs *regs)
31{ 35{
32 unsigned long pc = instruction_pointer(regs); 36 unsigned long pc = instruction_pointer(regs);
@@ -53,9 +57,7 @@ unsigned long profile_pc(struct pt_regs *regs)
53EXPORT_SYMBOL(profile_pc); 57EXPORT_SYMBOL(profile_pc);
54 58
55/* 59/*
56 * This is the same as the above, except we _also_ save the current 60 * Default timer interrupt handler for PIT/HPET
57 * Time Stamp Counter value at the time of the timer interrupt, so that
58 * we later on can estimate the time of day more exactly.
59 */ 61 */
60static irqreturn_t timer_interrupt(int irq, void *dev_id) 62static irqreturn_t timer_interrupt(int irq, void *dev_id)
61{ 63{