diff options
| author | David Shaohua Li <shaohua.li@intel.com> | 2005-09-21 01:35:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-11-30 22:27:16 -0500 |
| commit | e6e87b4bfe3720b4308a8e669078d9be58bc9780 (patch) | |
| tree | 2f839782c4bac7820fc3c7f0c8867990bf4ae739 /arch/i386 | |
| parent | d2149b542382bfc206cb28485108f6470c979566 (diff) | |
[ACPI] properly detect pmtimer on ASUS a8v motherboard
Handle FADT 2.0 xpmtmr address 0 case.
http://bugzilla.kernel.org/show_bug.cgi?id=5283
Signed-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 76b1135d401..447fa9e33ff 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) return 0; pmtmr_ioport = fadt->xpm_tmr_blk.address; + /* + * "X" fields are optional extensions to the original V1.0 + * fields, so we must selectively expand V1.0 fields if the + * corresponding X field is zero. + */ + if (!pmtmr_ioport) + pmtmr_ioport = fadt->V1_pm_tmr_blk; } else { /* FADT rev. 1 */ pmtmr_ioport = fadt->V1_pm_tmr_blk; |