From patchwork Thu Mar 15 15:39:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 131806 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1270925ljb; Thu, 15 Mar 2018 08:40:03 -0700 (PDT) X-Google-Smtp-Source: AG47ELuA4GO/Z2i2TxkQ4FuyUccs0SE0v2q+lvJuZj6ZS4qxLYWIXV7++WgCQqOF+hKosY+bJRoX X-Received: by 10.98.245.131 with SMTP id b3mr8135401pfm.20.1521128402870; Thu, 15 Mar 2018 08:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521128402; cv=none; d=google.com; s=arc-20160816; b=swPPn3AVq0nE0nntGRrThxR9+PjTdGxgGZknT40e5Tctz2LxLZg1J1wAUz+qjy7PIV Ur6J4PamrG2ZyIZMMJnqvG5MV3aak+mTzUzpxHea6GHqAkTjyg7dd8Nus53dvxheexVF Vh3WRSEov195g3tX/48dbSlLkFkzMGNb8hbKY8MzgKFJXXOFMPQkcq1wKeclMZTV6Vs5 8uU+YUQnqeCNSRuUFwBrfbv2HmRBxLzQsB0H57+RSznVoiuVl3Q32ZWNc7BbxRWb+WUJ 5/GmsqUq4wHLd902OUy9QsCsif/99vxbM3nyEVqbddr4HHIciRocvfZOm9Dp0vnAD5fr ktMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=d/ndxLbzlCaEEOGQSye/4+44cZwXNkkxcqpBohvgPh8=; b=IGUU2DuVYWOkXOoztMKqQdLCAUMNgvmUjfxSyVWorZ9jUOOvnptV9pJw+P+7kSZuTF FXwwHL4eyii8tYukz9M7jM6rkWaGkVlhdm6B+0W1hZDoocQfY+IDwaq1vXoz6V0WNDsj ipsVt3RzhrosBwVm6gIo4jDeYfvNcqg6uNzv8xDSTu5YhSdGl49or+vOLpaXPmd404t6 E7KbeoNoiTsImkSV21Q5xh7wHnpj+nZCrfQmiyo62R05sU1clD+605CA3uMcpP8LOCvJ 9HBGFxraEaKUuNOhqhd9O5avEEwYDBs9kV+GyahDT4IijSo+Y+6dfj0azuUieZ3c3bvN cutw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 99-v6si4259159plc.601.2018.03.15.08.40.02; Thu, 15 Mar 2018 08:40:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932486AbeCOPj7 (ORCPT + 28 others); Thu, 15 Mar 2018 11:39:59 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:36199 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932427AbeCOPj5 (ORCPT ); Thu, 15 Mar 2018 11:39:57 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0M6VWV-1egkAu3d5X-00yQ7V; Thu, 15 Mar 2018 16:39:35 +0100 From: Arnd Bergmann To: Darren Hart , Andy Shevchenko Cc: Arnd Bergmann , Mario Limonciello , Hans de Goede , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] platform/x86: dell: avoid link error with modular ACPI_SMI Date: Thu, 15 Mar 2018 16:39:07 +0100 Message-Id: <20180315153934.3844276-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:RALNamAAmVwPvwgJNcOs+rZ50kykAaHzVgebphk0r2RNayE402y XAPBYeB3rcOh3Wzg503J/GwpBVfpFyww9eSDX1iRh4bZJjEL0pxJPU8aVF+/axiYHzYY/GV z04G2CuApnZb3g4iUZGu+z9BN0EOgejIE+SN49VL6yCT9Z/xteOYYi1sU/uKlB9Ln2Wlf0m 0trl2CxfDjt8K3AjtNJDQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:txZdxXPxdjs=:beaYMHro9jCMtR3Me9VZ93 RE7zURFj0lnIPJaQ8aQBpUmaFNOitxofMtvXyX/dDJywpCMUw78kVZYRwQZP1oimaqhpP1kaS k3pyEWNzYufr7333e8WEW1isWdGAtqEdPZGRHeksro31gkl2tMvjK8W9F2SlNhRyawcOGrD9F l6AWyvyuRRxkiAVJBTeS8Lx0eIekDsjG6p5xrebMx1jZOKbjZtwJ2cL0duvz1fLPTKMTE3hVg 9J2Zbx6CPFXicrpkr+u83RqUZAv3XDM1Y4Iwir4Fo9U87kfQPqUrGsBAxbcNBAqybMI6nIsUC GYM457Eo3n6342oXimqGOdyaoSWIZaQtxDsfUpXStk9WfHsl2dQZsIbbBR9aYr7LFqbZGNbcj xSowF49ilNrau95FK+w17oWUsl1tLxKD1uaGZxCFONJv/XgH96N7GBOHJgWHBxMGr1qilMXbE SYzlIBRm7KgKrw7A8KJN1U3jhbL8cVPD07NrMSVq2rHhx/PthEduJotlecgilTNnBNaeZNlcW WS5LSwH/fZ5Tq8uRUeZUx2w1F7ArP4pe0Wp5z357kG2xtikGqAvGAcLhyNiwBpXtX5rGcnfK1 ttmvc5Z2HGW2bVvE+k34y81vf38q2iuSmFhmlvqxIikkjZBFIO/0XNDil4/6/tNJIofnacebF to5qlyyBc8thcjmX7CUkvOrU8ZK/hkz5RzmGFWxWREvx/9MKITUgk3W9TtqEUeUYZ9D8gOGm6 zQGxKzy9IDdIDCs2WJrqzYyWeQEQuOCteDhmPg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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(+) -- 2.9.0 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---