From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmh1L-00GlvZ-3q for linux-um@lists.infradead.org; Mon, 15 Nov 2021 18:48:00 +0000 From: Greg Kroah-Hartman Subject: [PATCH 5.15 431/917] net: tulip: winbond-840: fix build for UML Date: Mon, 15 Nov 2021 17:58:46 +0100 Message-Id: <20211115165443.402790629@linuxfoundation.org> In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Jakub Kicinski , Sasha Levin RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCBhM2Q3MDg5MjVmY2NhMWEyZjcyMTliYzljZTkzZTYzNDFmODVjMWUwIF0KCk9uIGkzODYs IHdoZW4gYnVpbHRpbiAobm90IGEgbG9hZGFibGUgbW9kdWxlKSwgdGhlIHdpbmJvbmQtODQwIGRy aXZlcgppbnNwZWN0cyBib290X2NwdV9kYXRhIHRvIHNlZSB3aGF0IENQVSBmYW1pbHkgaXQgaXMg cnVubmluZyBvbiwgYW5kCnRoZW4gYWN0cyBvbiB0aGF0IGRhdGEuIFRoZSAiZmFtaWx5IiBzdHJ1 Y3QgbWVtYmVyICh4ODYpIGRvZXMgbm90IGV4aXN0CndoZW4gcnVubmluZyBvbiBVTUwsIHNvIHBy ZXZlbnQgdGhhdCB0ZXN0IGFuZCBkbyB0aGUgZGVmYXVsdCBhY3Rpb24uCgpQcmV2ZW50cyB0aGlz IGJ1aWxkIGVycm9yIG9uIFVNTCArIGkzODY6CgouLi9kcml2ZXJzL25ldC9ldGhlcm5ldC9kZWMv dHVsaXAvd2luYm9uZC04NDAuYzogSW4gZnVuY3Rpb24g4oCYaW5pdF9yZWdpc3RlcnPigJk6Ci4u L2RyaXZlcnMvbmV0L2V0aGVybmV0L2RlYy90dWxpcC93aW5ib25kLTg0MC5jOjg4MjoxOTogZXJy b3I6IOKAmHN0cnVjdCBjcHVpbmZvX3Vt4oCZIGhhcyBubyBtZW1iZXIgbmFtZWQg4oCYeDg24oCZ CiAgaWYgKGJvb3RfY3B1X2RhdGEueDg2IDw9IDQpIHsKCkZpeGVzOiA2OGY1ZDNmM2I2NTQgKCJ1 bTogYWRkIFBDSSBvdmVyIHZpcnRpbyBlbXVsYXRpb24gZHJpdmVyIikKU2lnbmVkLW9mZi1ieTog UmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CkNjOiBsaW51eC11bUBsaXN0cy5p bmZyYWRlYWQub3JnCkNjOiBKZWZmIERpa2UgPGpkaWtlQGFkZHRvaXQuY29tPgpDYzogUmljaGFy ZCBXZWluYmVyZ2VyIDxyaWNoYXJkQG5vZC5hdD4KQ2M6IEFudG9uIEl2YW5vdiA8YW50b24uaXZh bm92QGNhbWJyaWRnZWdyZXlzLmNvbT4KTGluazogaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvci8y MDIxMTAxNDA1MDYwNi43Mjg4LTEtcmR1bmxhcEBpbmZyYWRlYWQub3JnClNpZ25lZC1vZmYtYnk6 IEpha3ViIEtpY2luc2tpIDxrdWJhQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExl dmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL25ldC9ldGhlcm5ldC9kZWMvdHVs aXAvd2luYm9uZC04NDAuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwg MSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L2RlYy90dWxp cC93aW5ib25kLTg0MC5jIGIvZHJpdmVycy9uZXQvZXRoZXJuZXQvZGVjL3R1bGlwL3dpbmJvbmQt ODQwLmMKaW5kZXggODViOTkwOTljNmI5NC4uNWJhYmNmMDViYzJmMSAxMDA2NDQKLS0tIGEvZHJp dmVycy9uZXQvZXRoZXJuZXQvZGVjL3R1bGlwL3dpbmJvbmQtODQwLmMKKysrIGIvZHJpdmVycy9u ZXQvZXRoZXJuZXQvZGVjL3R1bGlwL3dpbmJvbmQtODQwLmMKQEAgLTg3Nyw3ICs4NzcsNyBAQCBz dGF0aWMgdm9pZCBpbml0X3JlZ2lzdGVycyhzdHJ1Y3QgbmV0X2RldmljZSAqZGV2KQogCQk4MDAw CTE2IGxvbmd3b3JkcwkJMDIwMCAyIGxvbmd3b3JkcwkyMDAwIDMyIGxvbmd3b3JkcwogCQlDMDAw CTMyICBsb25nd29yZHMJCTA0MDAgNCBsb25nd29yZHMgKi8KIAotI2lmIGRlZmluZWQgKF9faTM4 Nl9fKSAmJiAhZGVmaW5lZChNT0RVTEUpCisjaWYgZGVmaW5lZCAoX19pMzg2X18pICYmICFkZWZp bmVkKE1PRFVMRSkgJiYgIWRlZmluZWQoQ09ORklHX1VNTCkKIAkvKiBXaGVuIG5vdCBhIG1vZHVs ZSB3ZSBjYW4gd29yayBhcm91bmQgYnJva2VuICc0ODYgUENJIGJvYXJkcy4gKi8KIAlpZiAoYm9v dF9jcHVfZGF0YS54ODYgPD0gNCkgewogCQlpIHw9IDB4NDgwMDsKLS0gCjIuMzMuMAoKCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtdW0gbWFp bGluZyBsaXN0CmxpbnV4LXVtQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJh ZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC11bQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50EEDC433EF for ; Tue, 16 Nov 2021 00:40:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 326D9619EA for ; Tue, 16 Nov 2021 00:40:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352838AbhKPAmt (ORCPT ); Mon, 15 Nov 2021 19:42:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:45386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343903AbhKOTWY (ORCPT ); Mon, 15 Nov 2021 14:22:24 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 42E35633A0; Mon, 15 Nov 2021 18:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002078; bh=zhliUqB7AwUx2eOT56VImLysHnF9S+tfmfsRkohC4q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bN2uHJtZ0KxsqwPrSQysyR5yhDR5TFHjjKq1yyRj/MwO7u9cCmZMuca6MG6lJNxhL 82oPE3M9NFv0D3wXDSVTaiIRhVBAlMw7/VtAf41IIy9TaXSszuo32GBHk3kYmOuPzC rQBBS3r+H6TxiiTV6VZ92c46nqm6HXL8FmMczBwg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 431/917] net: tulip: winbond-840: fix build for UML Date: Mon, 15 Nov 2021 17:58:46 +0100 Message-Id: <20211115165443.402790629@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit a3d708925fcca1a2f7219bc9ce93e6341f85c1e0 ] On i386, when builtin (not a loadable module), the winbond-840 driver inspects boot_cpu_data to see what CPU family it is running on, and then acts on that data. The "family" struct member (x86) does not exist when running on UML, so prevent that test and do the default action. Prevents this build error on UML + i386: ../drivers/net/ethernet/dec/tulip/winbond-840.c: In function ‘init_registers’: ../drivers/net/ethernet/dec/tulip/winbond-840.c:882:19: error: ‘struct cpuinfo_um’ has no member named ‘x86’ if (boot_cpu_data.x86 <= 4) { Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap Cc: linux-um@lists.infradead.org Cc: Jeff Dike Cc: Richard Weinberger Cc: Anton Ivanov Link: https://lore.kernel.org/r/20211014050606.7288-1-rdunlap@infradead.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 85b99099c6b94..5babcf05bc2f1 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -877,7 +877,7 @@ static void init_registers(struct net_device *dev) 8000 16 longwords 0200 2 longwords 2000 32 longwords C000 32 longwords 0400 4 longwords */ -#if defined (__i386__) && !defined(MODULE) +#if defined (__i386__) && !defined(MODULE) && !defined(CONFIG_UML) /* When not a module we can work around broken '486 PCI boards. */ if (boot_cpu_data.x86 <= 4) { i |= 0x4800; -- 2.33.0