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>
This commit is contained in:
committed by
Thomas Gleixner
parent
cb2455aa27
commit
15f304b664
@@ -1,5 +1,11 @@
|
||||
config CLKSRC_I8253
|
||||
bool
|
||||
|
||||
config I8253_LOCK
|
||||
bool
|
||||
|
||||
config CLKBLD_I8253
|
||||
def_bool y if CLKSRC_I8253 || I8253_LOCK
|
||||
|
||||
config CLKSRC_MMIO
|
||||
bool
|
||||
|
||||
@@ -6,5 +6,5 @@ obj-$(CONFIG_CS5535_CLOCK_EVENT_SRC) += cs5535-clockevt.o
|
||||
obj-$(CONFIG_SH_TIMER_CMT) += sh_cmt.o
|
||||
obj-$(CONFIG_SH_TIMER_MTU2) += sh_mtu2.o
|
||||
obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o
|
||||
obj-$(CONFIG_CLKSRC_I8253) += i8253.o
|
||||
obj-$(CONFIG_CLKBLD_I8253) += i8253.o
|
||||
obj-$(CONFIG_CLKSRC_MMIO) += mmio.o
|
||||
|
||||
@@ -6,9 +6,19 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/timex.h>
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/i8253.h>
|
||||
|
||||
/*
|
||||
* Protects access to I/O ports
|
||||
*
|
||||
* 0040-0043 : timer0, i8253 / i8254
|
||||
* 0061-0061 : NMI Control Register which contains two speaker control bits.
|
||||
*/
|
||||
DEFINE_RAW_SPINLOCK(i8253_lock);
|
||||
EXPORT_SYMBOL(i8253_lock);
|
||||
|
||||
#ifdef CONFIG_CLKSRC_I8253
|
||||
/*
|
||||
* Since the PIT overflows every tick, its not very useful
|
||||
* to just read by itself. So use jiffies to emulate a free
|
||||
@@ -86,3 +96,4 @@ int __init clocksource_i8253_init(void)
|
||||
{
|
||||
return clocksource_register_hz(&i8253_cs, PIT_TICK_RATE);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user