Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70a20025 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: move pmtmr related declarations 



Move more stuff out of proto.h

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 80ca9c98

arch/x86/kernel/apic_64.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/pmtimer_64.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

include/asm-x86/proto.h

+0 −9
Original line number Diff line number Diff line
@@ -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);

include/linux/acpi_pmtmr.h

+2 −0
Original line number Diff line number Diff line
@@ -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)