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: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: john stultz <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c
index 73c33429f0e075c2dbebf98c71eaba0a4ace3556..6d839f2f1b1a6e1abca311760ac89f6a6deec6af 100644 (file)
--- a/arch/i386/kernel/i8253.c
+++ b/arch/i386/kernel/i8253.c
@@ -15,8 +15,6 @@
 #include <asm/io.h>
 #include <asm/timer.h>
 
-#include "io_ports.h"
-
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);
 

diff --git a/arch/i386/kernel/vmiclock.c b/arch/i386/kernel/vmiclock.c
index d23077cca45b1b3cd4f55108ef4350c68f318fa6..b1b5ab08b26eaaa26a955eb93f9502f7ed8e89ce 100644 (file)
--- a/arch/i386/kernel/vmiclock.c
+++ b/arch/i386/kernel/vmiclock.c
@@ -32,6 +32,7 @@
 #include <asm/apicdef.h>
 #include <asm/apic.h>
 #include <asm/timer.h>
+#include <asm/i8253.h>
 
 #include <irq_vectors.h>
 #include "io_ports.h"

diff --git a/include/asm-i386/i8253.h b/include/asm-i386/i8253.h
index a06b8ec66ce0f658fb042ec0f5886f3e67a68c81..7577d058d86e7ef292bf63f78eb3e139527cbc0b 100644 (file)
--- a/include/asm-i386/i8253.h
+++ b/include/asm-i386/i8253.h
@@ -3,8 +3,15 @@
 
 #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 struct clock_event_device *global_clock_event;
 
+extern void setup_pit_timer(void);
+
 #endif /* __ASM_I8253_H__ */

diff --git a/include/asm-i386/mach-default/io_ports.h b/include/asm-i386/mach-default/io_ports.h
index a96d9f6604eec83839c89c34d0262e3c6938ed8e..48540ba971667225977fed53cbc6d898d2e9d628 100644 (file)
--- a/include/asm-i386/mach-default/io_ports.h
+++ b/include/asm-i386/mach-default/io_ports.h
@@ -7,11 +7,6 @@
 #ifndef _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 */
 #define PIC_MASTER_CMD         0x20
 #define PIC_MASTER_IMR         0x21

diff --git a/include/asm-i386/timer.h b/include/asm-i386/timer.h
index b371667cfdeb52a87898b4ecccb1fb85dc2ca5bb..0db7e994fb8b4f40ad9a96ecf2258d7fd6dc57f6 100644 (file)
--- a/include/asm-i386/timer.h
+++ b/include/asm-i386/timer.h
@@ -5,7 +5,6 @@
 
 #define TICK_SIZE (tick_nsec / 1000)
 
-void setup_pit_timer(void);
 unsigned long long native_sched_clock(void);
 unsigned long native_calculate_cpu_khz(void);