summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 19:04:58 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:38 +0200
commitcb2455aa274b780802c593fecf115240a655d809 (patch)
tree3273999ee348f14e74c6b8632954f0f8e5b52859
parent334955ef964bee9d3b1e20966847eee28cfd05f6 (diff)
downloadlinux-stable-cb2455aa274b780802c593fecf115240a655d809.tar.gz
linux-stable-cb2455aa274b780802c593fecf115240a655d809.tar.bz2
linux-stable-cb2455aa274b780802c593fecf115240a655d809.zip
i8253: Unify all kernel declarations of i8253_lock
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mips@linux-mips.org Link: http://lkml.kernel.org/r/20110601180610.134151920@duck.linux-mips.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/arm/include/asm/i8253.h9
-rw-r--r--arch/mips/include/asm/i8253.h12
-rw-r--r--arch/x86/include/asm/i8253.h10
-rw-r--r--include/linux/i8253.h14
4 files changed, 14 insertions, 31 deletions
diff --git a/arch/arm/include/asm/i8253.h b/arch/arm/include/asm/i8253.h
index 70656b69d5ce..5b41b92ecf6a 100644
--- a/arch/arm/include/asm/i8253.h
+++ b/arch/arm/include/asm/i8253.h
@@ -1,15 +1,6 @@
#ifndef __ASMARM_I8253_H
#define __ASMARM_I8253_H
-/* i8253A PIT registers */
-#define PIT_MODE 0x43
-#define PIT_CH0 0x40
-
#define PIT_LATCH ((PIT_TICK_RATE + HZ / 2) / HZ)
-extern raw_spinlock_t i8253_lock;
-
-#define outb_pit outb_p
-#define inb_pit inb_p
-
#endif
diff --git a/arch/mips/include/asm/i8253.h b/arch/mips/include/asm/i8253.h
index 9ad011366f73..32ec1f00c6b3 100644
--- a/arch/mips/include/asm/i8253.h
+++ b/arch/mips/include/asm/i8253.h
@@ -5,20 +5,8 @@
#ifndef __ASM_I8253_H
#define __ASM_I8253_H
-#include <linux/spinlock.h>
-
-/* i8253A PIT registers */
-#define PIT_MODE 0x43
-#define PIT_CH0 0x40
-#define PIT_CH2 0x42
-
#define PIT_LATCH LATCH
-extern raw_spinlock_t i8253_lock;
-
extern void setup_pit_timer(void);
-#define inb_pit inb_p
-#define outb_pit outb_p
-
#endif /* __ASM_I8253_H */
diff --git a/arch/x86/include/asm/i8253.h b/arch/x86/include/asm/i8253.h
index 65aaa91d5850..20480cef7547 100644
--- a/arch/x86/include/asm/i8253.h
+++ b/arch/x86/include/asm/i8253.h
@@ -1,20 +1,10 @@
#ifndef _ASM_X86_I8253_H
#define _ASM_X86_I8253_H
-/* i8253A PIT registers */
-#define PIT_MODE 0x43
-#define PIT_CH0 0x40
-#define PIT_CH2 0x42
-
#define PIT_LATCH LATCH
-extern raw_spinlock_t i8253_lock;
-
extern struct clock_event_device *global_clock_event;
extern void setup_pit_timer(void);
-#define inb_pit inb_p
-#define outb_pit outb_p
-
#endif /* _ASM_X86_I8253_H */
diff --git a/include/linux/i8253.h b/include/linux/i8253.h
index d2cba88f75d6..13048d335368 100644
--- a/include/linux/i8253.h
+++ b/include/linux/i8253.h
@@ -2,10 +2,24 @@
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
+ *
+ * Machine specific IO port address definition for generic.
+ * Written by Osamu Tomita <tomita@cinet.co.jp>
*/
#ifndef __LINUX_I8253_H
#define __LINUX_I8253_H
+#include <linux/spinlock.h>
#include <asm/i8253.h>
+/* i8253A PIT registers */
+#define PIT_MODE 0x43
+#define PIT_CH0 0x40
+#define PIT_CH2 0x42
+
+#define inb_pit inb_p
+#define outb_pit outb_p
+
+extern raw_spinlock_t i8253_lock;
+
#endif /* __LINUX_I8253_H */