Skip to content

Commit

Permalink
[PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available
Browse files Browse the repository at this point in the history
Avoids some ifdef mess later.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andi Kleen authored and Linus Torvalds committed Feb 5, 2006
1 parent eddb6fb commit 226d780
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions include/asm-x86_64/proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ extern void iommu_hole_init(void);
extern void time_init_gtod(void);
extern int pmtimer_mark_offset(void);
extern unsigned int do_gettimeoffset_pm(void);
#ifdef CONFIG_X86_PM_TIMER
extern u32 pmtmr_ioport;
#else
#define pmtmr_ioport 0
#endif
extern unsigned long long monotonic_base;
extern int sysctl_vsyscall;

Expand Down

0 comments on commit 226d780

Please sign in to comment.