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 1mmh1F-00GltH-KZ for linux-um@lists.infradead.org; Mon, 15 Nov 2021 18:47:55 +0000 From: Greg Kroah-Hartman Subject: [PATCH 5.15 429/917] net: fealnx: fix build for UML Date: Mon, 15 Nov 2021 17:58:44 +0100 Message-Id: <20211115165443.338738029@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 bW1pdCBjZDI2MjFkMDdkNTE3NDczNjExYjE3MGM2OWJlYjY1MjRjNjc3NzQwIF0KCk9uIGkzODYs IHdoZW4gYnVpbHRpbiAobm90IGEgbG9hZGFibGUgbW9kdWxlKSwgdGhlIGZlYWxueCBkcml2ZXIK aW5zcGVjdHMgYm9vdF9jcHVfZGF0YSB0byBzZWUgd2hhdCBDUFUgZmFtaWx5IGl0IGlzIHJ1bm5p bmcgb24sIGFuZAp0aGVuIGFjdHMgb24gdGhhdCBkYXRhLiBUaGUgImZhbWlseSIgc3RydWN0IG1l bWJlciAoeDg2KSBkb2VzIG5vdCBleGlzdAp3aGVuIHJ1bm5pbmcgb24gVU1MLCBzbyBwcmV2ZW50 IHRoYXQgdGVzdCBhbmQgZG8gdGhlIGRlZmF1bHQgYWN0aW9uLgoKUHJldmVudHMgdGhpcyBidWls ZCBlcnJvciBvbiBVTUwgKyBpMzg2OgoKLi4vZHJpdmVycy9uZXQvZXRoZXJuZXQvZmVhbG54LmM6 IEluIGZ1bmN0aW9uIOKAmG5ldGRldl9vcGVu4oCZOgouLi9kcml2ZXJzL25ldC9ldGhlcm5ldC9m ZWFsbnguYzo4NjE6MTk6IGVycm9yOiDigJhzdHJ1Y3QgY3B1aW5mb191beKAmSBoYXMgbm8gbWVt YmVyIG5hbWVkIOKAmHg4NuKAmQoKRml4ZXM6IDY4ZjVkM2YzYjY1NCAoInVtOiBhZGQgUENJIG92 ZXIgdmlydGlvIGVtdWxhdGlvbiBkcml2ZXIiKQpTaWduZWQtb2ZmLWJ5OiBSYW5keSBEdW5sYXAg PHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KQ2M6IGxpbnV4LXVtQGxpc3RzLmluZnJhZGVhZC5vcmcK Q2M6IEplZmYgRGlrZSA8amRpa2VAYWRkdG9pdC5jb20+CkNjOiBSaWNoYXJkIFdlaW5iZXJnZXIg PHJpY2hhcmRAbm9kLmF0PgpDYzogQW50b24gSXZhbm92IDxhbnRvbi5pdmFub3ZAY2FtYnJpZGdl Z3JleXMuY29tPgpMaW5rOiBodHRwczovL2xvcmUua2VybmVsLm9yZy9yLzIwMjExMDE0MDUwNTAw LjU2MjAtMS1yZHVubGFwQGluZnJhZGVhZC5vcmcKU2lnbmVkLW9mZi1ieTogSmFrdWIgS2ljaW5z a2kgPGt1YmFAa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBr ZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvbmV0L2V0aGVybmV0L2ZlYWxueC5jIHwgMiArLQogMSBm aWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9uZXQvZXRoZXJuZXQvZmVhbG54LmMgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9mZWFs bnguYwppbmRleCAyNWM5MWIzYzVmZDMwLi44MTkyNjZkNDYzYjA3IDEwMDY0NAotLS0gYS9kcml2 ZXJzL25ldC9ldGhlcm5ldC9mZWFsbnguYworKysgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9mZWFs bnguYwpAQCAtODU3LDcgKzg1Nyw3IEBAIHN0YXRpYyBpbnQgbmV0ZGV2X29wZW4oc3RydWN0IG5l dF9kZXZpY2UgKmRldikKIAlucC0+YmNydmFsdWUgfD0gMHgwNDsJLyogYmlnLWVuZGlhbiAqLwog I2VuZGlmCiAKLSNpZiBkZWZpbmVkKF9faTM4Nl9fKSAmJiAhZGVmaW5lZChNT0RVTEUpCisjaWYg ZGVmaW5lZChfX2kzODZfXykgJiYgIWRlZmluZWQoTU9EVUxFKSAmJiAhZGVmaW5lZChDT05GSUdf VU1MKQogCWlmIChib290X2NwdV9kYXRhLng4NiA8PSA0KQogCQlucC0+Y3J2YWx1ZSA9IDB4YTAw OwogCWVsc2UKLS0gCjIuMzMuMAoKCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KbGludXgtdW0gbWFpbGluZyBsaXN0CmxpbnV4LXVtQGxpc3RzLmluZnJh ZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51 eC11bQo= 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 A3776C433F5 for ; Mon, 15 Nov 2021 23:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B34A61A0C for ; Mon, 15 Nov 2021 23:39:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347903AbhKOXmB (ORCPT ); Mon, 15 Nov 2021 18:42:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:45224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343872AbhKOTWQ (ORCPT ); Mon, 15 Nov 2021 14:22:16 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id CD99863393; Mon, 15 Nov 2021 18:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002073; bh=ELe964MnL6byNaeDUTR2gPdUO6JYoB1JQSLrQAenmBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QyMO8Ky6qcNt2zysPfh2NCnExSD0pgJg2tdJ+5qfA1SUi0fSi7/XcyHGn/x0Q694b Y3nJMKfOaXeDKU8MXKqfSJnjdrtaK/ZSEzcK07ssAIxNVvb1d4wTissCB24ssnwQYJ rS1sBp2lMP1R0giI12dluCYqIzdg++Wjf7MMVMB0= 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 429/917] net: fealnx: fix build for UML Date: Mon, 15 Nov 2021 17:58:44 +0100 Message-Id: <20211115165443.338738029@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 cd2621d07d517473611b170c69beb6524c677740 ] On i386, when builtin (not a loadable module), the fealnx 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/fealnx.c: In function ‘netdev_open’: ../drivers/net/ethernet/fealnx.c:861:19: error: ‘struct cpuinfo_um’ has no member named ‘x86’ 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/20211014050500.5620-1-rdunlap@infradead.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/fealnx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index 25c91b3c5fd30..819266d463b07 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c @@ -857,7 +857,7 @@ static int netdev_open(struct net_device *dev) np->bcrvalue |= 0x04; /* big-endian */ #endif -#if defined(__i386__) && !defined(MODULE) +#if defined(__i386__) && !defined(MODULE) && !defined(CONFIG_UML) if (boot_cpu_data.x86 <= 4) np->crvalue = 0xa00; else -- 2.33.0