Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: move pmtmr related declarations

Browse Source 
Move more stuff out of proto.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2008-01-30 13:30:18 +01:00 committed by Ingo Molnar
parent 80ca9c98f5
commit 70a2002563
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/kernel/apic_64.c
View File

@ -26,6 +26,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/acpi_pmtmr.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/smp.h> #include <asm/smp.h>

4
arch/x86/kernel/pmtimer_64.c
View File

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

9
include/asm-x86/proto.h
View File

@ -25,15 +25,6 @@ extern void ia32_sysenter_target(void);
extern void config_acpi_tables(void); extern void config_acpi_tables(void);
extern void ia32_syscall(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 int nohpet;
extern void reserve_bootmem_generic(unsigned long phys, unsigned len); extern void reserve_bootmem_generic(unsigned long phys, unsigned len);

2
include/linux/acpi_pmtmr.h
View File

@ -25,6 +25,8 @@ static inline u32 acpi_pm_read_early(void)
return acpi_pm_read_verified() & ACPI_PM_MASK; return acpi_pm_read_verified() & ACPI_PM_MASK;
} }
extern void pmtimer_wait(unsigned);
#else #else
static inline u32 acpi_pm_read_early(void) static inline u32 acpi_pm_read_early(void)