lkml.org 
[lkml]   [2011]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:timers/cleanup] i8253: Unify all kernel declarations of i8253_lock
Commit-ID:  cb2455aa274b780802c593fecf115240a655d809
Gitweb: http://git.kernel.org/tip/cb2455aa274b780802c593fecf115240a655d809
Author: Ralf Baechle <ralf@linux-mips.org>
AuthorDate: Wed, 1 Jun 2011 19:04:58 +0100
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 9 Jun 2011 15:01:38 +0200

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>

---
arch/arm/include/asm/i8253.h | 9 ---------
arch/mips/include/asm/i8253.h | 12 ------------
arch/x86/include/asm/i8253.h | 10 ----------
include/linux/i8253.h | 14 ++++++++++++++
4 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/arch/arm/include/asm/i8253.h b/arch/arm/include/asm/i8253.h
index 70656b6..5b41b92 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 9ad0113..32ec1f0 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 65aaa91..20480ce 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 d2cba88..13048d3 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 */

\
 
 \ /
  Last update: 2011-06-09 15:07    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean