diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 14:04:59 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:01:38 -0400 |
commit | 15f304b664c0d0a3e76ed3a9ce3615a86908babe (patch) | |
tree | 5203cc0ce3981a7055003e04dc7d9aab56457e48 /arch/x86 | |
parent | cb2455aa274b780802c593fecf115240a655d809 (diff) |
i8253: Consolidate all kernel definitions of i8253_lock
Move them to drivers/clocksource/i8253.c and remove the
implementations in arch/
[ tglx: Avoid the extra file in lib - folded arch patches in. The
export will become conditional in a later step ]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Link: http://lkml.kernel.org/r/20110601180610.221426078@duck.linux-mips.net
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/kernel/i8253.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index da349723d411..e6060a1c1b58 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -70,6 +70,7 @@ config X86 | |||
70 | select IRQ_FORCED_THREADING | 70 | select IRQ_FORCED_THREADING |
71 | select USE_GENERIC_SMP_HELPERS if SMP | 71 | select USE_GENERIC_SMP_HELPERS if SMP |
72 | select HAVE_BPF_JIT if (X86_64 && NET) | 72 | select HAVE_BPF_JIT if (X86_64 && NET) |
73 | select I8253_LOCK | ||
73 | 74 | ||
74 | config INSTRUCTION_DECODER | 75 | config INSTRUCTION_DECODER |
75 | def_bool (KPROBES || PERF_EVENTS) | 76 | def_bool (KPROBES || PERF_EVENTS) |
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c index 323555050f89..9c92b6ff571f 100644 --- a/arch/x86/kernel/i8253.c +++ b/arch/x86/kernel/i8253.c | |||
@@ -16,9 +16,6 @@ | |||
16 | #include <asm/hpet.h> | 16 | #include <asm/hpet.h> |
17 | #include <asm/smp.h> | 17 | #include <asm/smp.h> |
18 | 18 | ||
19 | DEFINE_RAW_SPINLOCK(i8253_lock); | ||
20 | EXPORT_SYMBOL(i8253_lock); | ||
21 | |||
22 | /* | 19 | /* |
23 | * HPET replaces the PIT, when enabled. So we need to know, which of | 20 | * HPET replaces the PIT, when enabled. So we need to know, which of |
24 | * the two timers is used | 21 | * the two timers is used |