diff options
| author |   Andi Kleen <ak@suse.de> | 2006-02-03 21:50:44 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 16:43:12 -0800 |
| commit | 226d780909f71bebfa4dfffa21493244aa22dfdc (patch) | |
| tree | ae9f0ff1e2b62076585825379c3b859ad3f3a1af /include | |
| parent | [PATCH] x86_64: Disallow kprobes on NMI handlers (diff) | |
| download | linux-dev-226d780909f71bebfa4dfffa21493244aa22dfdc.tar.xz linux-dev-226d780909f71bebfa4dfffa21493244aa22dfdc.zip | |
[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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/proto.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 115e496c6139..d35c7e06f340 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -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; |