i8253: Unify all kernel declarations of i8253_lock

Signed-off-by: Ralf Baechle <[email protected]>
Cc: Russell King <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>
This commit is contained in:
Ralf Baechle 2011-06-01 19:04:58 +01:00 • committed by Thomas Gleixner
commit cb2455aa27
4 changed files with 14 additions and 31 deletions

View file

@ -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

View file

@ -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 */

View file

@ -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 */

View file

@ -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 */