diff options
| author | Len Brown <len.brown@intel.com> | 2005-11-30 22:28:15 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-11-30 22:28:15 -0500 |
| commit | c8734a9663806b7ebd3b5e33bae65a60ff6553bd (patch) | |
| tree | 24fe706394e2981866bbf852e1c0e673c94f8e1f | |
| parent | 8e9887cc3b8d9f1c88c6f3842346a9478e52718f (diff) | |
| parent | e6e87b4bfe3720b4308a8e669078d9be58bc9780 (diff) | |
Pull 5283 into release branch
| -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 76b1135d401a..447fa9e33ffb 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) | |||
| 638 | return 0; | 638 | return 0; |
| 639 | 639 | ||
| 640 | pmtmr_ioport = fadt->xpm_tmr_blk.address; | 640 | pmtmr_ioport = fadt->xpm_tmr_blk.address; |
| 641 | /* | ||
| 642 | * "X" fields are optional extensions to the original V1.0 | ||
| 643 | * fields, so we must selectively expand V1.0 fields if the | ||
| 644 | * corresponding X field is zero. | ||
| 645 | */ | ||
| 646 | if (!pmtmr_ioport) | ||
| 647 | pmtmr_ioport = fadt->V1_pm_tmr_blk; | ||
| 641 | } else { | 648 | } else { |
| 642 | /* FADT rev. 1 */ | 649 | /* FADT rev. 1 */ |
| 643 | pmtmr_ioport = fadt->V1_pm_tmr_blk; | 650 | pmtmr_ioport = fadt->V1_pm_tmr_blk; |