Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 70a20025632ca320316b5068326784d07c8ff351

Authored by Thomas Gleixner
Committed by Ingo Molnar
1 parent 80ca9c98f5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 5 additions and 11 deletions Side-by-side Diff

arch/x86/kernel/apic_64.c
Diff comments   View file @ 70a2002
... ... @@ -26,6 +26,7 @@
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>
arch/x86/kernel/pmtimer_64.c
Diff comments   View file @ 70a2002
... ... @@ -19,12 +19,12 @@
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 {
include/asm-x86/proto.h
Diff comments   View file @ 70a2002
... ... @@ -25,15 +25,6 @@
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);
include/linux/acpi_pmtmr.h
Diff comments   View file @ 70a2002
... ... @@ -25,6 +25,8 @@
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)