summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/smp.c')
-rw-r--r--arch/i386/kernel/smp.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index 59af7034d..9acf81556 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -11,6 +11,7 @@
#include <linux/init.h>
#include <linux/mm.h>
+#include <linux/spinlock.h>
#include <linux/kernel_stat.h>
#include <linux/smp_lock.h>
#include <linux/irq.h>
@@ -638,12 +639,19 @@ int prof_counter[NR_CPUS] = { 1, };
*/
static unsigned int __init get_8254_timer_count(void)
{
+ extern rwlock_t xtime_lock;
+ unsigned long flags;
+
unsigned int count;
+ write_lock_irqsave(&xtime_lock, flags);
+
outb_p(0x00, 0x43);
count = inb_p(0x40);
count |= inb_p(0x40) << 8;
+ write_unlock_irqrestore(&xtime_lock, flags);
+
return count;
}