Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Gleixner and committed by
Ingo Molnar
70a20025 80ca9c98

+5 -11
+1
arch/x86/kernel/apic_64.c
··· 26 26 #include <linux/module.h> 27 27 #include <linux/ioport.h> 28 28 #include <linux/clockchips.h> 29 + #include <linux/acpi_pmtmr.h> 29 30 30 31 #include <asm/atomic.h> 31 32 #include <asm/smp.h>
+2 -2
arch/x86/kernel/pmtimer_64.c
··· 19 19 #include <linux/time.h> 20 20 #include <linux/init.h> 21 21 #include <linux/cpumask.h> 22 + #include <linux/acpi_pmtmr.h> 23 + 22 24 #include <asm/io.h> 23 25 #include <asm/proto.h> 24 26 #include <asm/msr.h> 25 27 #include <asm/vsyscall.h> 26 - 27 - #define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ 28 28 29 29 static inline u32 cyc2us(u32 cycles) 30 30 {
-9
include/asm-x86/proto.h
··· 25 25 extern void config_acpi_tables(void); 26 26 extern void ia32_syscall(void); 27 27 28 - extern int pmtimer_mark_offset(void); 29 - extern void pmtimer_resume(void); 30 - extern void pmtimer_wait(unsigned); 31 - extern unsigned int do_gettimeoffset_pm(void); 32 - #ifdef CONFIG_X86_PM_TIMER 33 - extern u32 pmtmr_ioport; 34 - #else 35 - #define pmtmr_ioport 0 36 - #endif 37 28 extern int nohpet; 38 29 39 30 extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
+2
include/linux/acpi_pmtmr.h
··· 25 25 return acpi_pm_read_verified() & ACPI_PM_MASK; 26 26 } 27 27 28 + extern void pmtimer_wait(unsigned); 29 + 28 30 #else 29 31 30 32 static inline u32 acpi_pm_read_early(void)