Messages in this thread Patch in this message | | | Date | Sun, 15 Jul 2007 16:10:59 -0000 | From | Thomas Gleixner <> | Subject | [patch-mm 18/33] x86_64: use shared i8253.h |
| |
Use the i386 i8253.h include file for x86_64 as well to share the exports and the PIT constants.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- arch/x86_64/kernel/time.c | 4 ---- include/asm-x86_64/i8253.h | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-)
Index: linux-2.6.22-rc6-mm/include/asm-x86_64/i8253.h =================================================================== --- linux-2.6.22-rc6-mm.orig/include/asm-x86_64/i8253.h 2007-07-15 17:26:45.000000000 +0200 +++ linux-2.6.22-rc6-mm/include/asm-x86_64/i8253.h 2007-07-15 17:39:28.000000000 +0200 @@ -1,6 +1,2 @@ -#ifndef __ASM_I8253_H__ -#define __ASM_I8253_H__ - -extern spinlock_t i8253_lock; - -#endif /* __ASM_I8253_H__ */ +#include <asm-i386/i8253.h> +#include <asm/8253pit.h> Index: linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c =================================================================== --- linux-2.6.22-rc6-mm.orig/arch/x86_64/kernel/time.c 2007-07-15 17:34:42.000000000 +0200 +++ linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c 2007-07-15 17:48:54.000000000 +0200 @@ -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 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; --
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |