tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform drives fixes from Darren Hart:

- DELL_SMBIOS conditionally depends on ACPI_WMI in the same way it
depends on DCDBAS, update the Kconfig accordingly.

- fix the dell driver init order to ensure that the driver dependencies
are met, avoiding race conditions resulting in boot failure on
certain systems when the drivers are built-in.

* tag 'platform-drivers-x86-v4.16-7' of git://git.infradead.org/linux-platform-drivers-x86:
platform/x86: Fix dell driver init order
platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI

Linus Torvalds 274a1ff0 3032f8c5

+7 -6
+1 -1
drivers/firmware/dcdbas.c
··· 639 639 platform_driver_unregister(&dcdbas_driver); 640 640 } 641 641 642 - module_init(dcdbas_init); 642 + subsys_initcall_sync(dcdbas_init); 643 643 module_exit(dcdbas_exit); 644 644 645 645 MODULE_DESCRIPTION(DRIVER_DESCRIPTION " (version " DRIVER_VERSION ")");
+4 -3
drivers/platform/x86/Kconfig
··· 106 106 If you have an ACPI-compatible ASUS laptop, say Y or M here. 107 107 108 108 # 109 - # If the DELL_SMBIOS_SMM feature is enabled, the DELL_SMBIOS driver 110 - # becomes dependent on the DCDBAS driver. The "depends" line prevents a 111 - # configuration where DELL_SMBIOS=y while DCDBAS=m. 109 + # The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those 110 + # backends are selected. The "depends" line prevents a configuration 111 + # where DELL_SMBIOS=y while either of those dependencies =m. 112 112 # 113 113 config DELL_SMBIOS 114 114 tristate "Dell SMBIOS driver" 115 115 depends on DCDBAS || DCDBAS=n 116 + depends on ACPI_WMI || ACPI_WMI=n 116 117 ---help--- 117 118 This provides support for the Dell SMBIOS calling interface. 118 119 If you have a Dell computer you should enable this option.
+1 -1
drivers/platform/x86/dell-smbios-base.c
··· 637 637 mutex_unlock(&smbios_mutex); 638 638 } 639 639 640 - subsys_initcall(dell_smbios_init); 640 + module_init(dell_smbios_init); 641 641 module_exit(dell_smbios_exit); 642 642 643 643 MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>");
+1 -1
drivers/platform/x86/dell-wmi.c
··· 714 714 715 715 return wmi_driver_register(&dell_wmi_driver); 716 716 } 717 - module_init(dell_wmi_init); 717 + late_initcall(dell_wmi_init); 718 718 719 719 static void __exit dell_wmi_exit(void) 720 720 {