---

yaml --- r: 79754 b: refs/heads/master c: 70a2002 h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · 21d2656 · 21d2656
1 parent ec3bcc9
commit 21d2656
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80ca9c98f50c11b63b87971594d7e38cba0bbcef
+refs/heads/master: 70a20025632ca320316b5068326784d07c8ff351
diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/ioport.h>
 #include <linux/clockchips.h>
+#include <linux/acpi_pmtmr.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>

diff --git a/trunk/arch/x86/kernel/pmtimer_64.c b/trunk/arch/x86/kernel/pmtimer_64.c
@@ -19,13 +19,13 @@
 #include <linux/time.h>
 #include <linux/init.h>
 #include <linux/cpumask.h>
+#include <linux/acpi_pmtmr.h>
+
 #include <asm/io.h>
 #include <asm/proto.h>
 #include <asm/msr.h>
 #include <asm/vsyscall.h>
 
-#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */
-
 static inline u32 cyc2us(u32 cycles)
 {
 	/* The Power Management Timer ticks at 3.579545 ticks per microsecond.

diff --git a/trunk/include/asm-x86/proto.h b/trunk/include/asm-x86/proto.h
@@ -25,15 +25,6 @@ extern void ia32_sysenter_target(void);
 extern void config_acpi_tables(void);
 extern void ia32_syscall(void);
 
-extern int pmtimer_mark_offset(void);
-extern void pmtimer_resume(void);
-extern void pmtimer_wait(unsigned);
-extern unsigned int do_gettimeoffset_pm(void);
-#ifdef CONFIG_X86_PM_TIMER
-extern u32 pmtmr_ioport;
-#else
-#define pmtmr_ioport 0
-#endif
 extern int nohpet;
 
 extern void reserve_bootmem_generic(unsigned long phys, unsigned len);

diff --git a/trunk/include/linux/acpi_pmtmr.h b/trunk/include/linux/acpi_pmtmr.h
@@ -25,6 +25,8 @@ static inline u32 acpi_pm_read_early(void)
 	return acpi_pm_read_verified() & ACPI_PM_MASK;
 }
 
+extern void pmtimer_wait(unsigned);
+
 #else
 
 static inline u32 acpi_pm_read_early(void)
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ static inline u32 acpi_pm_read_early(void) @@
     	return acpi_pm_read_verified() & ACPI_PM_MASK;
     }
+    extern void pmtimer_wait(unsigned);
     #else
     static inline u32 acpi_pm_read_early(void)
@@ Expand Down @@