Commit a2900975 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

i386: move PIT function declarations and constants to correct header file

setup_pit_timer is declared in asm-i386/timer.h.  Move it to the pit header
file, so it can be used by x86_64 as well.

Move also the PIT constants.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43d6ca01
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/timer.h> #include <asm/timer.h>
#include "io_ports.h"
DEFINE_SPINLOCK(i8253_lock); DEFINE_SPINLOCK(i8253_lock);
EXPORT_SYMBOL(i8253_lock); EXPORT_SYMBOL(i8253_lock);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <asm/apicdef.h> #include <asm/apicdef.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/i8253.h>
#include <irq_vectors.h> #include <irq_vectors.h>
#include "io_ports.h" #include "io_ports.h"
......
...@@ -3,8 +3,15 @@ ...@@ -3,8 +3,15 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
/* i8253A PIT registers */
#define PIT_MODE 0x43
#define PIT_CH0 0x40
#define PIT_CH2 0x42
extern spinlock_t i8253_lock; extern spinlock_t i8253_lock;
extern struct clock_event_device *global_clock_event; extern struct clock_event_device *global_clock_event;
extern void setup_pit_timer(void);
#endif /* __ASM_I8253_H__ */ #endif /* __ASM_I8253_H__ */
...@@ -7,11 +7,6 @@ ...@@ -7,11 +7,6 @@
#ifndef _MACH_IO_PORTS_H #ifndef _MACH_IO_PORTS_H
#define _MACH_IO_PORTS_H #define _MACH_IO_PORTS_H
/* i8253A PIT registers */
#define PIT_MODE 0x43
#define PIT_CH0 0x40
#define PIT_CH2 0x42
/* i8259A PIC registers */ /* i8259A PIC registers */
#define PIC_MASTER_CMD 0x20 #define PIC_MASTER_CMD 0x20
#define PIC_MASTER_IMR 0x21 #define PIC_MASTER_IMR 0x21
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
void setup_pit_timer(void);
unsigned long long native_sched_clock(void); unsigned long long native_sched_clock(void);
unsigned long native_calculate_cpu_khz(void); unsigned long native_calculate_cpu_khz(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment