x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: e6d36a653becc7bbc643c399a77882e02bf552cb x86/reboot: Remove VersaLogic Menlow reboot quirk
Thanks,
Ingo
------------------>
Jan Beulich (1):
x86: Properly parenthesize cmpxchg() macro arguments
Michael D Labriola (2):
x86/reboot: Skip DMI checks if reboot set by user x86/reboot: Remove VersaLogic Menlow reboot quirk
arch/x86/include/asm/cmpxchg.h | 6 +++--- arch/x86/kernel/reboot.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 13 deletions(-)
arch/x86/include/asm/cmpxchg.h +3 -3
@@ -145,13 +145,13 @@ extern void __add_wrong_size(void)#ifdef __HAVE_ARCH_CMPXCHG#define cmpxchg (ptr, old, new) \ - __cmpxchg((ptr), (old), (new), sizeof(*ptr)) + __cmpxchg(ptr, old, new, sizeof(*(ptr)))#define sync_cmpxchg (ptr, old, new) \ - __sync_cmpxchg((ptr), (old), (new), sizeof(*ptr)) + __sync_cmpxchg(ptr, old, new, sizeof(*(ptr)))#define cmpxchg_local (ptr, old, new) \ - __cmpxchg_local((ptr), (old), (new), sizeof(*ptr)) + __cmpxchg_local(ptr, old, new, sizeof(*(ptr)))#endif /*
arch/x86/kernel/reboot.c +26 -10
@@ -39,6 +39,14 @@ static int reboot_mode;enum reboot_type reboot_type =BOOT_ACPI ;int reboot_force; +/* This variable is used privately to keep track of whether or not +* reboot_type is still set to its default value (i.e., reboot= hasn't +* been set on the command line). This is needed so that we can +* suppress DMI scanning for reboot quirks. Without it, it's +* impossible to override a faulty reboot quirk without recompiling. +*/ +static int reboot_default =1 ; +#if defined(CONFIG_X86_32 ) && defined(CONFIG_SMP )static int reboot_cpu =-1 ;#endif
@@ -67,6 +75,12 @@ bool port_cf9_safe = false;static int __init reboot_setup (char *str) {for (;;) { +/* Having anything passed on the command line via +* reboot= will cause us to disable DMI checking +* below. +*/ + reboot_default =0 ; +switch (*str) {case 'w' : reboot_mode =0x1234 ;
@@ -295,14 +309,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "P4S800"), }, }, - { /* Handle problems with rebooting on VersaLogic Menlow boards */ - .callback = set_bios_reboot, - .ident = "VersaLogic Menlow based board", - .matches = { -DMI_MATCH (DMI_BOARD_VENDOR ,"VersaLogic Corporation" ), - DMI_MATCH(DMI_BOARD_NAME, "VersaLogic Menlow board"), - }, - }, { /* Handle reboot issue on Acer Aspire one */ .callback = set_kbd_reboot, .ident = "Acer Aspire One A110",
@@ -316,7 +322,12 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {static int __init reboot_init (void ) { -dmi_check_system (reboot_dmi_table); +/* Only do the DMI check if reboot_type hasn't been overridden +* on the command line +*/ +if (reboot_default) { +dmi_check_system (reboot_dmi_table); + }return 0 ; }core_initcall (reboot_init);
@@ -465,7 +476,12 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = {static int __init pci_reboot_init (void ) { -dmi_check_system (pci_reboot_dmi_table); +/* Only do the DMI check if reboot_type hasn't been overridden +* on the command line +*/ +if (reboot_default) { +dmi_check_system (pci_reboot_dmi_table); + }return 0 ; }core_initcall (pci_reboot_init);