lkml.org 
[lkml]   [2008]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/16] Revert "x86: default to reboot via ACPI"
    Date
    This reverts commit c7ffa6c26277b403920e2255d10df849bd613380.

    Now that we have the hooks to disable virtualization on
    emergency_restart(), we can get back to the BOOT_KBD reboot_type default.

    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    ---
    arch/x86/kernel/reboot.c | 6 +-----
    1 files changed, 1 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
    index 932763f..f05e819 100644
    --- a/arch/x86/kernel/reboot.c
    +++ b/arch/x86/kernel/reboot.c
    @@ -32,11 +32,7 @@ EXPORT_SYMBOL(pm_power_off);

    static const struct desc_ptr no_idt = {};
    static int reboot_mode;
    -/*
    - * Keyboard reset and triple fault may result in INIT, not RESET, which
    - * doesn't work when we're in vmx root mode. Try ACPI first.
    - */
    -enum reboot_type reboot_type = BOOT_ACPI;
    +enum reboot_type reboot_type = BOOT_KBD;
    int reboot_force;

    #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
    --
    1.5.5.GIT


    \
     
     \ /
      Last update: 2008-11-04 15:59    [W:0.022 / U:0.508 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site