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 C365BC433F5 for ; Thu, 14 Oct 2021 05:05:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9209961108 for ; Thu, 14 Oct 2021 05:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229498AbhJNFHI (ORCPT ); Thu, 14 Oct 2021 01:07:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbhJNFHI (ORCPT ); Thu, 14 Oct 2021 01:07:08 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3504AC061570 for ; Wed, 13 Oct 2021 22:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:In-Reply-To:References; bh=pUhOvffUgdaRMsLNdO+OJlABBj1ygAcEK6RBWKzkh94=; b=F2EKzsH9diBbQJCbC9hPl0QC5/ La0VtYb/5r9r8Ng2xchcvx8J9MbS9UWV/nC2pcc2NNgSGVt6mwtRuaK82TdcZR591/odOzL8J151k dd8qaUzuexxYK9MTi/SPnmtsQwDw1qQrWQnticWRo+i5NG8/DcxilZ0FuwydeeOJ+vtdft3NZZriA IQbs/XaQemQCmCrtvqrSDfXJzjfsp2ZC0zTVv5vsDDHVV8adNj1EsfjEhDqPHZPDJmeyrerjuKQQH gASsR2a8M/FdTI6zdSKvpwyja3dHZavbw81uClCWDwd4H+pIGozZz86HV2anEhDWw3YOwv9pJJw1Q kJdE6QhA==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1masvN-001axd-AG; Thu, 14 Oct 2021 05:05:01 +0000 From: Randy Dunlap To: netdev@vger.kernel.org Cc: Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next] net: fealnx: fix build for UML Date: Wed, 13 Oct 2021 22:05:00 -0700 Message-Id: <20211014050500.5620-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: "David S. Miller" Cc: Jakub Kicinski --- drivers/net/ethernet/fealnx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-next-20211013.orig/drivers/net/ethernet/fealnx.c +++ linux-next-20211013/drivers/net/ethernet/fealnx.c @@ -857,7 +857,7 @@ static int netdev_open(struct net_device 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Randy Dunlap Subject: [PATCH net-next] net: fealnx: fix build for UML Date: Wed, 13 Oct 2021 22:05:00 -0700 Message-Id: <20211014050500.5620-1-rdunlap@infradead.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: netdev@vger.kernel.org Cc: Randy Dunlap , linux-um@lists.infradead.org, Jeff Dike , Richard Weinberger , Anton Ivanov , "David S. Miller" , Jakub Kicinski T24gaTM4Niwgd2hlbiBidWlsdGluIChub3QgYSBsb2FkYWJsZSBtb2R1bGUpLCB0aGUgZmVhbG54 IGRyaXZlcgppbnNwZWN0cyBib290X2NwdV9kYXRhIHRvIHNlZSB3aGF0IENQVSBmYW1pbHkgaXQg aXMgcnVubmluZyBvbiwgYW5kCnRoZW4gYWN0cyBvbiB0aGF0IGRhdGEuIFRoZSAiZmFtaWx5IiBz dHJ1Y3QgbWVtYmVyICh4ODYpIGRvZXMgbm90IGV4aXN0CndoZW4gcnVubmluZyBvbiBVTUwsIHNv IHByZXZlbnQgdGhhdCB0ZXN0IGFuZCBkbyB0aGUgZGVmYXVsdCBhY3Rpb24uCgpQcmV2ZW50cyB0 aGlzIGJ1aWxkIGVycm9yIG9uIFVNTCArIGkzODY6CgouLi9kcml2ZXJzL25ldC9ldGhlcm5ldC9m ZWFsbnguYzogSW4gZnVuY3Rpb24g4oCYbmV0ZGV2X29wZW7igJk6Ci4uL2RyaXZlcnMvbmV0L2V0 aGVybmV0L2ZlYWxueC5jOjg2MToxOTogZXJyb3I6IOKAmHN0cnVjdCBjcHVpbmZvX3Vt4oCZIGhh cyBubyBtZW1iZXIgbmFtZWQg4oCYeDg24oCZCgpGaXhlczogNjhmNWQzZjNiNjU0ICgidW06IGFk ZCBQQ0kgb3ZlciB2aXJ0aW8gZW11bGF0aW9uIGRyaXZlciIpClNpZ25lZC1vZmYtYnk6IFJhbmR5 IER1bmxhcCA8cmR1bmxhcEBpbmZyYWRlYWQub3JnPgpDYzogbGludXgtdW1AbGlzdHMuaW5mcmFk ZWFkLm9yZwpDYzogSmVmZiBEaWtlIDxqZGlrZUBhZGR0b2l0LmNvbT4KQ2M6IFJpY2hhcmQgV2Vp bmJlcmdlciA8cmljaGFyZEBub2QuYXQ+CkNjOiBBbnRvbiBJdmFub3YgPGFudG9uLml2YW5vdkBj YW1icmlkZ2VncmV5cy5jb20+CkNjOiAiRGF2aWQgUy4gTWlsbGVyIiA8ZGF2ZW1AZGF2ZW1sb2Z0 Lm5ldD4KQ2M6IEpha3ViIEtpY2luc2tpIDxrdWJhQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9u ZXQvZXRoZXJuZXQvZmVhbG54LmMgfCAgICAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKyksIDEgZGVsZXRpb24oLSkKCi0tLSBsaW51eC1uZXh0LTIwMjExMDEzLm9yaWcvZHJpdmVy cy9uZXQvZXRoZXJuZXQvZmVhbG54LmMKKysrIGxpbnV4LW5leHQtMjAyMTEwMTMvZHJpdmVycy9u ZXQvZXRoZXJuZXQvZmVhbG54LmMKQEAgLTg1Nyw3ICs4NTcsNyBAQCBzdGF0aWMgaW50IG5ldGRl dl9vcGVuKHN0cnVjdCBuZXRfZGV2aWNlCiAJbnAtPmJjcnZhbHVlIHw9IDB4MDQ7CS8qIGJpZy1l bmRpYW4gKi8KICNlbmRpZgogCi0jaWYgZGVmaW5lZChfX2kzODZfXykgJiYgIWRlZmluZWQoTU9E VUxFKQorI2lmIGRlZmluZWQoX19pMzg2X18pICYmICFkZWZpbmVkKE1PRFVMRSkgJiYgIWRlZmlu ZWQoQ09ORklHX1VNTCkKIAlpZiAoYm9vdF9jcHVfZGF0YS54ODYgPD0gNCkKIAkJbnAtPmNydmFs dWUgPSAweGEwMDsKIAllbHNlCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpsaW51eC11bSBtYWlsaW5nIGxpc3QKbGludXgtdW1AbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LXVt Cg==