Эх сурвалжийг харах

[PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available

Avoids some ifdef mess later.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andi Kleen 19 жил өмнө
parent
commit
226d780909

+ 4 - 0
include/asm-x86_64/proto.h

@@ -42,7 +42,11 @@ extern void iommu_hole_init(void);
 extern void time_init_gtod(void);
 extern void time_init_gtod(void);
 extern int pmtimer_mark_offset(void);
 extern int pmtimer_mark_offset(void);
 extern unsigned int do_gettimeoffset_pm(void);
 extern unsigned int do_gettimeoffset_pm(void);
+#ifdef CONFIG_X86_PM_TIMER
 extern u32 pmtmr_ioport;
 extern u32 pmtmr_ioport;
+#else
+#define pmtmr_ioport 0
+#endif
 extern unsigned long long monotonic_base;
 extern unsigned long long monotonic_base;
 extern int sysctl_vsyscall;
 extern int sysctl_vsyscall;