From: Andrew Morton Cc: Aaron Durbin Cc: Andi Kleen Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/acpi/reboot.c | 37 ++++++++++++++++++------------------- include/acpi/reboot.h | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) diff -puN drivers/acpi/reboot.c~acpi-add-reboot-mechanism-fix drivers/acpi/reboot.c --- a/drivers/acpi/reboot.c~acpi-add-reboot-mechanism-fix +++ a/drivers/acpi/reboot.c @@ -21,25 +21,24 @@ void acpi_reboot(void) /* The reset register can only exist in I/O, Memory or PCI config space * on a device on bus 0. */ switch (rr->space_id) { - case ACPI_ADR_SPACE_PCI_CONFIG: - /* The reset register can only live on bus 0. */ - bus0 = pci_find_bus(0, 0); - if (!bus0) - return; - /* Form PCI device/function pair. */ - devfn = PCI_DEVFN((rr->address >> 32) & 0xffff, - (rr->address >> 16) & 0xffff); - printk(KERN_DEBUG "Resetting with ACPI PCI RESET_REG."); - /* Write the value that resets us. */ - pci_bus_write_config_byte(bus0, devfn, - (rr->address & 0xffff), reset_value); - break; + case ACPI_ADR_SPACE_PCI_CONFIG: + /* The reset register can only live on bus 0. */ + bus0 = pci_find_bus(0, 0); + if (!bus0) + return; + /* Form PCI device/function pair. */ + devfn = PCI_DEVFN((rr->address >> 32) & 0xffff, + (rr->address >> 16) & 0xffff); + printk(KERN_DEBUG "Resetting with ACPI PCI RESET_REG."); + /* Write the value that resets us. */ + pci_bus_write_config_byte(bus0, devfn, + (rr->address & 0xffff), reset_value); + break; - case ACPI_ADR_SPACE_SYSTEM_MEMORY: - case ACPI_ADR_SPACE_SYSTEM_IO: - printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG."); - acpi_hw_low_level_write(8, reset_value, rr); - break; + case ACPI_ADR_SPACE_SYSTEM_MEMORY: + case ACPI_ADR_SPACE_SYSTEM_IO: + printk(KERN_DEBUG "ACPI MEMORY or I/O RESET_REG."); + acpi_hw_low_level_write(8, reset_value, rr); + break; } } - diff -puN include/acpi/reboot.h~acpi-add-reboot-mechanism-fix include/acpi/reboot.h --- a/include/acpi/reboot.h~acpi-add-reboot-mechanism-fix +++ a/include/acpi/reboot.h @@ -4,7 +4,7 @@ #ifdef CONFIG_ACPI extern void acpi_reboot(void); #else -#define acpi_reboot() +static inline void acpi_reboot(void) { } #endif #endif _