| Message ID | 20180315153934.3844276-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Darren Hart |
| Headers | show |
On March 15, 2018 8:39:07 AM PDT, Arnd Bergmann <arnd@arndb.de> wrote: >The new DELL_LAPTOP dependencies allowed one configuration that should >not >have been possible, with DELL_SMBIOS_WMI built-in, but ACPI_SMI as a >module: Hi Arnd, do you have the latest changes from me? The platform-drivers-x86-v4.16-7 PR to Linus yesterday has a fix for the ACPI_WMI dependency. Linus merged it yesterday.
On Thu, Mar 15, 2018 at 7:36 PM, <dvhart@infradead.org> wrote: > > > On March 15, 2018 8:39:07 AM PDT, Arnd Bergmann <arnd@arndb.de> wrote: >>The new DELL_LAPTOP dependencies allowed one configuration that should >>not >>have been possible, with DELL_SMBIOS_WMI built-in, but ACPI_SMI as a >>module: > > > Hi Arnd, do you have the latest changes from me? The > platform-drivers-x86-v4.16-7 PR to Linus yesterday has a fix for > the ACPI_WMI dependency. Linus merged it yesterday. I wrote my patch based on yesterday's linux-next, which didn't have the fix. Today's version has it, and looks good. My approach was slightly different from yours, so I didn't get a conflict when rebasing, but either one is sufficient. Arnd
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 8383806c360f..0cced065e298 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -122,6 +122,7 @@ config DELL_SMBIOS_WMI bool "Dell SMBIOS driver WMI backend" default y depends on ACPI_WMI + depends on ACPI_WMI=y || DELL_SMBIOS=m select DELL_WMI_DESCRIPTOR depends on DELL_SMBIOS ---help---
The new DELL_LAPTOP dependencies allowed one configuration that should not have been possible, with DELL_SMBIOS_WMI built-in, but ACPI_SMI as a module: drivers/platform/x86/dell-smbios-wmi.o: In function `run_smbios_call': dell-smbios-wmi.c:(.text+0x47): undefined reference to `wmidev_evaluate_method' drivers/platform/x86/dell-smbios-wmi.o: In function `dell_smbios_wmi_probe': dell-smbios-wmi.c:(.text+0x5d0): undefined reference to `dell_wmi_get_descriptor_valid' dell-smbios-wmi.c:(.text+0x60f): undefined reference to `dell_wmi_get_size' dell-smbios-wmi.c:(.text+0x61f): undefined reference to `dell_wmi_get_hotfix' dell-smbios-wmi.c:(.text+0x644): undefined reference to `set_required_buffer_size' drivers/platform/x86/dell-smbios-wmi.o: In function `exit_dell_smbios_wmi': dell-smbios-wmi.c:(.text+0x78e): undefined reference to `wmi_driver_unregister' This adds an extra dependency to avoid that case. Fixes: 41e36f2f85af ("platform/x86: dell-smbios: Link all dell-smbios-* modules together") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- I think the plan was to drop the change that caused it. For completeness, this patch is the last thing that I needed to make randconfig work reliably again. --- drivers/platform/x86/Kconfig | 1 + 1 file changed, 1 insertion(+)