aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-11-30 22:28:15 -0500
committerLen Brown <len.brown@intel.com>2005-11-30 22:28:15 -0500
commitc8734a9663806b7ebd3b5e33bae65a60ff6553bd (patch)
tree24fe706394e2981866bbf852e1c0e673c94f8e1f
parent8e9887cc3b8d9f1c88c6f3842346a9478e52718f (diff)
parente6e87b4bfe3720b4308a8e669078d9be58bc9780 (diff)
Pull 5283 into release branch
-rw-r--r--arch/i386/kernel/acpi/boot.c7
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;