summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 20:04:59 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:38 +0200
commit15f304b664c0d0a3e76ed3a9ce3615a86908babe (patch)
tree5203cc0ce3981a7055003e04dc7d9aab56457e48 /arch
parenti8253: Unify all kernel declarations of i8253_lock (diff)
downloadlinux-15f304b664c0d0a3e76ed3a9ce3615a86908babe.tar.xz
linux-15f304b664c0d0a3e76ed3a9ce3615a86908babe.zip
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')
-rw-r--r--arch/arm/mach-footbridge/isa-timer.c2
-rw-r--r--arch/mips/kernel/i8253.c3
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/kernel/i8253.c3
4 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index 3c7367be5459..71fd96df7f73 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -19,8 +19,6 @@
#include "common.h"
-DEFINE_RAW_SPINLOCK(i8253_lock);
-
static void pit_set_mode(enum clock_event_mode mode,
struct clock_event_device *evt)
{
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index 82b5a9f037e7..3d2ff57fa69a 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -16,9 +16,6 @@
#include <asm/io.h>
#include <asm/time.h>
-DEFINE_RAW_SPINLOCK(i8253_lock);
-EXPORT_SYMBOL(i8253_lock);
-
/*
* Initialize the PIT timer.
*
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
select IRQ_FORCED_THREADING
select USE_GENERIC_SMP_HELPERS if SMP
select HAVE_BPF_JIT if (X86_64 && NET)
+ select I8253_LOCK
config INSTRUCTION_DECODER
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 @@
#include <asm/hpet.h>
#include <asm/smp.h>
-DEFINE_RAW_SPINLOCK(i8253_lock);
-EXPORT_SYMBOL(i8253_lock);
-
/*
* HPET replaces the PIT, when enabled. So we need to know, which of
* the two timers is used