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 /drivers/clocksource/i8253.c | |
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 'drivers/clocksource/i8253.c')
-rw-r--r-- | drivers/clocksource/i8253.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c index 33735ebd2dcc..e594f52eb88e 100644 --- a/drivers/clocksource/i8253.c +++ b/drivers/clocksource/i8253.c | |||
@@ -6,10 +6,20 @@ | |||
6 | #include <linux/io.h> | 6 | #include <linux/io.h> |
7 | #include <linux/spinlock.h> | 7 | #include <linux/spinlock.h> |
8 | #include <linux/timex.h> | 8 | #include <linux/timex.h> |
9 | 9 | #include <linux/module.h> | |
10 | #include <linux/i8253.h> | 10 | #include <linux/i8253.h> |
11 | 11 | ||
12 | /* | 12 | /* |
13 | * Protects access to I/O ports | ||
14 | * | ||
15 | * 0040-0043 : timer0, i8253 / i8254 | ||
16 | * 0061-0061 : NMI Control Register which contains two speaker control bits. | ||
17 | */ | ||
18 | DEFINE_RAW_SPINLOCK(i8253_lock); | ||
19 | EXPORT_SYMBOL(i8253_lock); | ||
20 | |||
21 | #ifdef CONFIG_CLKSRC_I8253 | ||
22 | /* | ||
13 | * Since the PIT overflows every tick, its not very useful | 23 | * Since the PIT overflows every tick, its not very useful |
14 | * to just read by itself. So use jiffies to emulate a free | 24 | * to just read by itself. So use jiffies to emulate a free |
15 | * running counter: | 25 | * running counter: |
@@ -86,3 +96,4 @@ int __init clocksource_i8253_init(void) | |||
86 | { | 96 | { |
87 | return clocksource_register_hz(&i8253_cs, PIT_TICK_RATE); | 97 | return clocksource_register_hz(&i8253_cs, PIT_TICK_RATE); |
88 | } | 98 | } |
99 | #endif | ||