From bf6a4ff96b2fbc2f8d84c45dd8ff53500bca8def Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Fri, 11 Mar 2011 16:12:19 -0500
Subject: [PATCH] --- yaml --- r: 241712 b: refs/heads/master c:
 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bb9f1d6b295d..0f44bafdd843 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f17d9cbf20c4734c4199caa6dee87047f2f8278f
+refs/heads/master: 6734fe57a07b2dd23ef1ef2ac1f790747e53eefc
diff --git a/trunk/drivers/acpi/reboot.c b/trunk/drivers/acpi/reboot.c
index 93f91142d7ad..4870aaaa2ae1 100644
--- a/trunk/drivers/acpi/reboot.c
+++ b/trunk/drivers/acpi/reboot.c
@@ -15,9 +15,10 @@ void acpi_reboot(void)
 
 	rr = &acpi_gbl_FADT.reset_register;
 
-	/* Is the reset register supported? */
-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) ||
-	    rr->bit_width != 8 || rr->bit_offset != 0)
+	/* Is the reset register supported? The spec says we should be
+	 * checking the bit width and bit offset, but Windows ignores
+	 * these fields */
+	if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER))
 		return;
 
 	reset_value = acpi_gbl_FADT.reset_value;
@@ -45,6 +46,4 @@ void acpi_reboot(void)
 		acpi_reset();
 		break;
 	}
-	/* Wait ten seconds */
-	acpi_os_stall(10000000);
 }