From 540ed13eba7b5aa27df27a75411aab7d9e991426 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 6 Nov 2008 20:51:59 -0500 Subject: [PATCH] --- yaml --- r: 118791 b: refs/heads/master c: d17cb18a07c587b8f9ff174a1bf6d03413eabe64 h: refs/heads/master i: 118789: f1bc6bc52447deaa0246a9a1b5bd904f67c793ad 118787: a229de7eee9c2f3c9c7611d327ad1333633bf9a5 118783: e9cfd9d0e9c7c1ce7a6051b7a72d180d1d5e5070 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/reboot.c | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index b1fd4cc6e64f..c224eeb1cf42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4a9bc4c7de4cef83e86a7052eb2e88b193668e4 +refs/heads/master: d17cb18a07c587b8f9ff174a1bf6d03413eabe64 diff --git a/trunk/drivers/acpi/reboot.c b/trunk/drivers/acpi/reboot.c index 755baf2ca70a..a6b662c00b67 100644 --- a/trunk/drivers/acpi/reboot.c +++ b/trunk/drivers/acpi/reboot.c @@ -15,28 +15,9 @@ void acpi_reboot(void) rr = &acpi_gbl_FADT.reset_register; - /* - * Is the ACPI reset register supported? - * - * According to ACPI 3.0, FADT.flags.RESET_REG_SUP indicates - * whether the ACPI reset mechanism is supported. - * - * However, some boxes have this bit clear, yet a valid - * ACPI_RESET_REG & RESET_VALUE, and ACPI reboot is the only - * mechanism that works for them after S3. - * - * This suggests that other operating systems may not be checking - * the RESET_REG_SUP bit, and are using other means to decide - * whether to use the ACPI reboot mechanism or not. - * - * So when acpi reboot is requested, - * only the reset_register is checked. If the following - * conditions are met, it indicates that the reset register is supported. - * a. reset_register is not zero - * b. the access width is eight - * c. the bit_offset is zero - */ - if (!(rr->address) || rr->bit_width != 8 || rr->bit_offset != 0) + /* Is the reset register supported? */ + if (!(acpi_gbl_FADT.flags & ACPI_FADT_RESET_REGISTER) || + rr->bit_width != 8 || rr->bit_offset != 0) return; reset_value = acpi_gbl_FADT.reset_value;