diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:18 -0500 |
commit | 70a20025632ca320316b5068326784d07c8ff351 (patch) | |
tree | 06e3098d91423fe58d1a658c97ecd8af3bb042c6 /arch/x86/kernel | |
parent | 80ca9c98f50c11b63b87971594d7e38cba0bbcef (diff) |
x86: move pmtmr related declarations
Move more stuff out of proto.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 1 | ||||
-rw-r--r-- | arch/x86/kernel/pmtimer_64.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 3de3764a862c..0cb14d4c2c5c 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
28 | #include <linux/clockchips.h> | 28 | #include <linux/clockchips.h> |
29 | #include <linux/acpi_pmtmr.h> | ||
29 | 30 | ||
30 | #include <asm/atomic.h> | 31 | #include <asm/atomic.h> |
31 | #include <asm/smp.h> | 32 | #include <asm/smp.h> |
diff --git a/arch/x86/kernel/pmtimer_64.c b/arch/x86/kernel/pmtimer_64.c index ae8f91214f15..b112406f1996 100644 --- a/arch/x86/kernel/pmtimer_64.c +++ b/arch/x86/kernel/pmtimer_64.c | |||
@@ -19,13 +19,13 @@ | |||
19 | #include <linux/time.h> | 19 | #include <linux/time.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/cpumask.h> | 21 | #include <linux/cpumask.h> |
22 | #include <linux/acpi_pmtmr.h> | ||
23 | |||
22 | #include <asm/io.h> | 24 | #include <asm/io.h> |
23 | #include <asm/proto.h> | 25 | #include <asm/proto.h> |
24 | #include <asm/msr.h> | 26 | #include <asm/msr.h> |
25 | #include <asm/vsyscall.h> | 27 | #include <asm/vsyscall.h> |
26 | 28 | ||
27 | #define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ | ||
28 | |||
29 | static inline u32 cyc2us(u32 cycles) | 29 | static inline u32 cyc2us(u32 cycles) |
30 | { | 30 | { |
31 | /* The Power Management Timer ticks at 3.579545 ticks per microsecond. | 31 | /* The Power Management Timer ticks at 3.579545 ticks per microsecond. |