---

yaml --- r: 67751 b: refs/heads/master c: 0190dae h: refs/heads/master i: 67749: aebf5f3 67747: a376f01 67743: 9e377e2 v: v3
git-mirror · Oct 12, 2007 · 76c97dd · 76c97dd
1 parent bfd046b
commit 76c97dd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 34 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5e0e93faf8421083853b2d7a217267f49e27cc3
+refs/heads/master: 0190dae54de62fbb9ced75d134015266987eb6b8
diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c
@@ -32,7 +32,6 @@
 #include <acpi/achware.h>	/* for PM timer frequency */
 #include <acpi/acpi_bus.h>
 #endif
-#include <asm/8253pit.h>
 #include <asm/i8253.h>
 #include <asm/pgtable.h>
 #include <asm/vsyscall.h>
@@ -292,9 +291,6 @@ static unsigned int __init tsc_calibrate_cpu_khz(void)
 	return pmc_now * tsc_khz / (tsc_now - tsc_start);
 }
 
-#define PIT_MODE 0x43
-#define PIT_CH0  0x40
-
 static void __pit_init(int val, u8 mode)
 {
 	unsigned long flags;

diff --git a/trunk/include/asm-x86/i8253.h b/trunk/include/asm-x86/i8253.h
@@ -1,5 +1,23 @@
-#ifdef CONFIG_X86_32
-# include "i8253_32.h"
-#else
-# include "i8253_64.h"
+#ifndef __ASM_I8253_H__
+#define __ASM_I8253_H__
+
+#ifdef CONFIG_X86_64
+# include <asm/8253pit.h>
 #endif
+
+/* i8253A PIT registers */
+#define PIT_MODE		0x43
+#define PIT_CH0			0x40
+#define PIT_CH2			0x42
+
+extern spinlock_t i8253_lock;
+
+#ifdef CONFIG_GENERIC_CLOCKEVENTS
+
+extern struct clock_event_device *global_clock_event;
+
+extern void setup_pit_timer(void);
+
+#endif
+
+#endif	/* __ASM_I8253_H__ */
diff --git a/trunk/include/asm-x86/i8253_32.h b/trunk/include/asm-x86/i8253_32.h
diff --git a/trunk/include/asm-x86/i8253_64.h b/trunk/include/asm-x86/i8253_64.h