Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp1840160imm; Mon, 3 Sep 2018 10:48:14 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY34TtqNsQ5Ppip+zH2veiN2gwRbA7zwp2y3TImIkc97fJ1+D1J04GHBc8yem42JE/b+twU X-Received: by 2002:a63:25c4:: with SMTP id l187-v6mr19921988pgl.29.1535996894732; Mon, 03 Sep 2018 10:48:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535996894; cv=none; d=google.com; s=arc-20160816; b=s/HfvWSgS6yA70Sh7RMGs+IB2MhCNNi+I4wsmfbl597igu08ItOO08ajawjcPtvASV VQGr55mBEDBjt4/GQ0aITTdy12f2h3ACgVc+MORoXPoYsbirGvrGxmhdhEX2RzqDeP6N NCJw1BlITGZO1MzK7tcFUczZaUNcv+L8bbnT7i087fRw060iPI0ClwDrbaiW7kKnE00K /v52nWOAqpgW3foOLOXr0r9ewbThWvV5w0FxMpAEQUzmchbINjilpXbnS6w2VOreUKZP ALqaA+2wgWnS2WwfE5fUKHATYI+nKGyvhD/G5FS9JmnMnfCNsOF2NTEWE+C+vwmSF8Pi BPWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=z3uJFsPyxMQGNk+XWn4WZIeWNcqCyNRxNL4ZSOun07Y=; b=k0ToIr9ZQKQcLttXVFkGIQaFrrKQLV9nCvVZKQKceOceIicN7zA4jiHTSyJdSPn5GE nBvvtQ4cMlDyxPVm3KnIYG2kNtFOHVRmt6wjYzGGmCjoc6bQseOhAZoBk6aUNL1x2uGL YlQlpiPARy9w/AJa6kBba+khFeGEQkgx/yqlVgYgwR8ChPHeB1nAMeac07YVoBjGkFD/ QehIrq9eQ4lIEPWyyYJzzi91bd/2MRIbV4LTVBqdtLdVeUXEj6UsxEQ1F3riEeo5EPQp DliWgotDe40oBcWz4JNwDFMlzIAOjYjgLLtiX3+OP1PtZ/phSnmPWYTEh9niSpWWuguJ 6imA== 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 f190-v6si19157006pfc.327.2018.09.03.10.47.59; Mon, 03 Sep 2018 10:48:14 -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 S1730100AbeICViK (ORCPT + 99 others); Mon, 3 Sep 2018 17:38:10 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:42702 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728282AbeICViJ (ORCPT ); Mon, 3 Sep 2018 17:38:09 -0400 Received: from localhost (ip-213-127-74-90.ip.prioritytelecom.net [213.127.74.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 30A37D02; Mon, 3 Sep 2018 17:17:04 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Michael Ellerman , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 038/165] net: prevent ISA drivers from building on PPC32 Date: Mon, 3 Sep 2018 18:55:24 +0200 Message-Id: <20180903165657.009878417@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180903165655.003605184@linuxfoundation.org> References: <20180903165655.003605184@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap [ Upstream commit c9ce1fa1c24b08e13c2a3b5b1f94a19c9eaa982c ] Prevent drivers from building on PPC32 if they use isa_bus_to_virt(), isa_virt_to_bus(), or isa_page_to_bus(), which are not available and thus cause build errors. ../drivers/net/ethernet/3com/3c515.c: In function 'corkscrew_open': ../drivers/net/ethernet/3com/3c515.c:824:9: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/amd/lance.c: In function 'lance_rx': ../drivers/net/ethernet/amd/lance.c:1203:23: error: implicit declaration of function 'isa_bus_to_virt'; did you mean 'bus_to_virt'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/amd/ni65.c: In function 'ni65_init_lance': ../drivers/net/ethernet/amd/ni65.c:585:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/cirrus/cs89x0.c: In function 'net_open': ../drivers/net/ethernet/cirrus/cs89x0.c:897:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] Signed-off-by: Randy Dunlap Suggested-by: Michael Ellerman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/3com/Kconfig | 2 +- drivers/net/ethernet/amd/Kconfig | 4 ++-- drivers/net/ethernet/cirrus/Kconfig | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/3com/Kconfig +++ b/drivers/net/ethernet/3com/Kconfig @@ -32,7 +32,7 @@ config EL3 config 3C515 tristate "3c515 ISA \"Fast EtherLink\"" - depends on ISA && ISA_DMA_API + depends on ISA && ISA_DMA_API && !PPC32 ---help--- If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet network card, say Y here. --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig @@ -44,7 +44,7 @@ config AMD8111_ETH config LANCE tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. Some LinkSys cards are of this type. @@ -138,7 +138,7 @@ config PCMCIA_NMCLAN config NI65 tristate "NI6510 support" - depends on ISA && ISA_DMA_API && !ARM + depends on ISA && ISA_DMA_API && !ARM && !PPC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. --- a/drivers/net/ethernet/cirrus/Kconfig +++ b/drivers/net/ethernet/cirrus/Kconfig @@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS config CS89x0 tristate "CS89x0 support" depends on ISA || EISA || ARM + depends on !PPC32 ---help--- Support for CS89x0 chipset based Ethernet cards. If you have a network (Ethernet) card of this type, say Y and read the file