lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull 5283 into release branch

Browse Source
This commit is contained in:
Len Brown
2005-11-30 22:28:15 -05:00
parent 8e9887cc3b e6e87b4bfe
commit c8734a9663
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/i386/kernel/acpi/boot.c
View File

@@ -638,6 +638,13 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
return 0; return 0;
pmtmr_ioport = fadt->xpm_tmr_blk.address; 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 { } else {
/* FADT rev. 1 */ /* FADT rev. 1 */
pmtmr_ioport = fadt->V1_pm_tmr_blk; pmtmr_ioport = fadt->V1_pm_tmr_blk;