From patchwork Mon Jun 17 12:59:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 167024 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2832563ilk; Mon, 17 Jun 2019 06:00:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7A47+TYzx12Qtug8HeTGDWnDMdjdlAD0uh4h1a9W42jEI3dewxMcuwqL0VUHeVbFCBdQP X-Received: by 2002:aa7:91c5:: with SMTP id z5mr21831482pfa.34.1560776441312; Mon, 17 Jun 2019 06:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560776441; cv=none; d=google.com; s=arc-20160816; b=zDUojCQTIRMyfFTg9JJOBq8jl0LizjBJbf8oSDGezEowcvAtw3db5uTkAEieqrfChv llbxPWuBm12Wn7HIUVTwyJLHJWUW3eB+mvfH2OCudv2pPtwaLL0CrBVEkUPH3Kee5AxZ 1OweSURV4sIvtgeRM7wviHpbYdG2w7YcpHa1j96IiipPfCAdA8I2ocujdYM9QttOAtbc SRX+17xgxDdkqgd0wDMvaeB7ZMVytGOD84QYdmc7KPzA6P8ZerCQ8KLqAvg9EegK9VXZ vJvARCjfkBbRhgNp94DhtvszfulpPKNqboKb6aHXl/XOnA1jVNcArL9XkIgEOHHKoDYU LpNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Wr42gU98z1+Oz5OfKjT1cca+XkFihcE7qpcPjd7VKKM=; b=rTHMfVmkSF0TGz/k1ezZMQWtTU/kuArMplzFPWa+y4l+fDPIDq6Z2ri8D0fWbePnwB YLWd2tRiww0+J2zCgdBj9jM6FWgYt29mhEfBpokDGAaPoeGeeS7uwOJ/vLrKqT1to5Ir 5P8IT8eD0RN2o7DQSO8u4eyViCx8dwFaDJTcT9WaD71W2xzA98AoQKTKJFrX8THMu8WZ whgYQQq44sAoei1ZoYE6cL0L0zZLd3zcp1Pa095mkEGaLk2i/Cr2l8CmuF1WiRp3dggX f4PksLMhUc49ByQzYzK4DQxbhQ59p6z1eKswOr8REcTN8BOutdIoSjZqUSDb6KuFOnZM 2B3g== 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 o6si10888583pgk.52.2019.06.17.06.00.41; Mon, 17 Jun 2019 06:00:41 -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 S1727518AbfFQNAj (ORCPT + 27 others); Mon, 17 Jun 2019 09:00:39 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:59849 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725983AbfFQNAj (ORCPT ); Mon, 17 Jun 2019 09:00:39 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.145]) with ESMTPA (Nemesis) id 1N4hBx-1iaUKt1pPL-011g38; Mon, 17 Jun 2019 15:00:16 +0200 From: Arnd Bergmann To: Luis Chamberlain , Greg Kroah-Hartman Cc: Arnd Bergmann , Matteo Croce , Kees Cook , Aaron Tomlin , Matthew Wilcox , Andrew Morton , Stephen Rothwell , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH] proc/sysctl: make firmware loader table conditional Date: Mon, 17 Jun 2019 14:59:42 +0200 Message-Id: <20190617130014.1713870-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:XTaIUBGjnjT9WW+czXzvrv/r6EJZj+23Cfw8xaApEgCOB08WIB2 Caascn262VC4BGM7/2JOvQmm1nrwtRybanDDj6heklnQ2fppRPXpumytuwrjV6UD6Q4iP2C X4f6AHv7mT1R68rVpfFnXJ0p0XOVTtRdLdRd/KdiOwi8+Ylup8EA71o6vGuLganbXPo628K 5kOm82C+aVxLM08P75kRw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:hMkOW4RJ2SI=:Vg0iBnXdbNqA7hKySE5/Vn s+mXw+lDyr66Gs5nXuWJxU2nbaiCgkSBh858yebRs+4VlQt562twokmps5zKjVn73nTyd3lAd A7Uib48RFr0mmR46ff0nH1uTml5BpL9Jl3Q1zcGUqOUcnECeHWt2SYZlnkCmX/197X87rl5iA lnPIg/U5StCueSKDJ0y6cAQ7suhziSl8/yln6JofhqGkh2cTNGe/t4IpXW6Kj2Ap2VwhZyyQm hYzoz5MIOWJhEEFHh9Foi5dlzKu9NPN+z182zFnxaROmnkARmGOFQybM1o5B5YkkX+smFXrIX w5Gqe06Ui7/4ez9GWBjG4M1Nk8QYEXCUNdCbeBo4szPELGqjYv1wYHVWULXNgSrzHGOxWSHQA pw/xox9+ZdbWAI7vD/G7la/xN7WNpkOesMnzFVHLRmX54JUbHywTB/mBwzJUJQ5PmbOt5plv7 w8FPUtD7gRUc2D8QHfDNUzYPv1GyH2tFyA7qDUlOf3N54fZw0P1G1ow8IunWg3dj6pBdvN2jg 3sQEqdaZMuvuU+oKtvZ7A/OTDymex75ivvLMARQ6G46Sss8bITW79gxb5sdRasAMkyYuhk93J lphWHohjS6q6cK5oRrtsmvxUkdqLoblEIV4lnQCeLp5QrYFrmm7wTl496sFhvCmrEQtaI7VcD CSiP9rc5XAw9RvyCtXT9AV0qDHzLA1h6RcoxPH8+MHVr2gCFG/W+DPTdSWgvvFclIy1+PF+fC 9LGY4lxjbWJiV8X+ECpCNKy++s14rgfw0QhUrg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We get a link error in the firmware loader fallback table, which now refers to the global sysctl_vals variable: drivers/base/firmware_loader/fallback_table.o:(.data+0x2c): undefined reference to `sysctl_vals' drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals' drivers/base/firmware_loader/fallback_table.o:(.data+0x50): undefined reference to `sysctl_vals' drivers/base/firmware_loader/fallback_table.o:(.data+0x54): undefined reference to `sysctl_vals' Add an #ifdef that only builds that table when it is being used. Fixes: c81c506545f4 ("proc/sysctl: add shared variables for range check") Signed-off-by: Arnd Bergmann --- drivers/base/firmware_loader/fallback_table.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.0 diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c index 58d4a1263480..ba9d30b28edc 100644 --- a/drivers/base/firmware_loader/fallback_table.c +++ b/drivers/base/firmware_loader/fallback_table.c @@ -23,6 +23,7 @@ struct firmware_fallback_config fw_fallback_config = { }; EXPORT_SYMBOL_GPL(fw_fallback_config); +#ifdef CONFIG_SYSCTL struct ctl_table firmware_config_table[] = { { .procname = "force_sysfs_fallback", @@ -45,3 +46,4 @@ struct ctl_table firmware_config_table[] = { { } }; EXPORT_SYMBOL_GPL(firmware_config_table); +#endif