diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-21 11:11:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:12 -0400 |
commit | 28318daf791b692f2654cb9c89687388063bd42b (patch) | |
tree | 6ec7b7d3862c513135455156d17c738ec15aebf7 /arch/x86_64/kernel/time.c | |
parent | 021daae2c265a844fd27bb6cc49c2bd114571069 (diff) |
x86_64: use the global PIT lock
Replace the pcspkr private PIT lock by the global PIT lock to serialize the
PIT access all over the place.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 3c34e8def89d..6d48a4e826d9 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <acpi/acpi_bus.h> | 33 | #include <acpi/acpi_bus.h> |
34 | #endif | 34 | #endif |
35 | #include <asm/8253pit.h> | 35 | #include <asm/8253pit.h> |
36 | #include <asm/i8253.h> | ||
36 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
37 | #include <asm/vsyscall.h> | 38 | #include <asm/vsyscall.h> |
38 | #include <asm/timex.h> | 39 | #include <asm/timex.h> |
@@ -51,6 +52,7 @@ static char *timename = NULL; | |||
51 | DEFINE_SPINLOCK(rtc_lock); | 52 | DEFINE_SPINLOCK(rtc_lock); |
52 | EXPORT_SYMBOL(rtc_lock); | 53 | EXPORT_SYMBOL(rtc_lock); |
53 | DEFINE_SPINLOCK(i8253_lock); | 54 | DEFINE_SPINLOCK(i8253_lock); |
55 | EXPORT_SYMBOL(i8253_lock); | ||
54 | 56 | ||
55 | volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; | 57 | volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; |
56 | 58 | ||