From 32709d28d0f3dced092338b5a2dab6df0066c283 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2012 11:19:35 -0700
Subject: [PATCH] --- yaml --- r: 299393 b: refs/heads/master c:
 19244ad06b70ed84931df868583547ce1cd3a186 h: refs/heads/master i:   299391:
 9b267327c05c39ba24abee70679017246429370e v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/acpica/hwxface.c | 3 ++-
 trunk/drivers/acpi/reboot.c         | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f8fc171f1e68..b2e3327e146f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3dc627cabb33fc95f93da78457770c1b2a364d2
+refs/heads/master: 19244ad06b70ed84931df868583547ce1cd3a186
diff --git a/trunk/drivers/acpi/acpica/hwxface.c b/trunk/drivers/acpi/acpica/hwxface.c
index ab513a972c95..a716fede4f25 100644
--- a/trunk/drivers/acpi/acpica/hwxface.c
+++ b/trunk/drivers/acpi/acpica/hwxface.c
@@ -74,7 +74,8 @@ acpi_status acpi_reset(void)
 
 	/* Check if the reset register is supported */
 
-	if (!reset_reg->address) {
+	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
+	    !reset_reg->address) {
 		return_ACPI_STATUS(AE_NOT_EXIST);
 	}
 
diff --git a/trunk/drivers/acpi/reboot.c b/trunk/drivers/acpi/reboot.c
index c1d612435939..a6c77e8b37bd 100644
--- a/trunk/drivers/acpi/reboot.c
+++ b/trunk/drivers/acpi/reboot.c
@@ -23,7 +23,8 @@ void acpi_reboot(void)
 	/* Is the reset register supported? The spec says we should be
 	 * checking the bit width and bit offset, but Windows ignores
 	 * these fields */
-	/* Ignore also acpi_gbl_FADT.flags.ACPI_FADT_RESET_REGISTER */
+	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER))
+		return;
 
 	reset_value = acpi_gbl_FADT.reset_value;