From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 5.14 038/169] hamradio: baycom_epp: fix build for UML Date: Mon, 25 Oct 2021 21:13:39 +0200 Message-ID: <20211025191022.696563287@linuxfoundation.org> References: <20211025191017.756020307@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=a31YufXcycf4jodYBJpi+HvY+42cxaasIHiw3JxIyg4=; b=rEczS7RgtwMSn+ 1EwqU5TyLB2nYEnveCqCWk2OJARFbDWAX9IS4iiGqPG/K+iQlSJtMisoDEhum3LlMC8DmcqkprYxM EL6iIYQ2iQPMljEJaJq34cIe5RzSPuD/IQd3lCBbK3rmUnLU0fiyjnlJJ7QP2znJknWg8K0N256e0 w/loVcIqYmYdyxl3ZWJCt3Io8yvqMJF5atKrp5HHNsP4rKmjpaAKR8mGNumTdtnc1tB02Y+fmky0X 9PzMtCqoof6coqY1lNP8em0ONW/THMa55ElXA3dQR0v98Udes8Roj8V6iuecmxCYDVAwDkvkRP7ZZ x211jc0LpLmmioUmC2lw==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635190773; bh=x78di4Y7cau7oQeUDkoo6UR9fiq7T4VUxl685vD7tkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I2GorxHfUzq1wPWvRMsH+a5EIrG29etv8trXzgAOPQAd8uI6GdgzvXuMHWwLagAog WXVd/k/gUF6p8FaK8sVi9upnRiRf4E6AJ+AHbHMFALLNAXs9aKckgNi32BAxuaJEOb tdjbDcEKCYuhm18LNqJcKYVfnOCq31j6C2bqj8P0= In-Reply-To: <20211025191017.756020307@linuxfoundation.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+glud-user-mode-linux-devel=m.gmane-mx.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 , "David S. Miller" , Jakub Kicinski , Thomas Sailer , linux-hams@vger.kernel.org, Sasha Levin RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCAwYTliYjExYTVlMjk4ZTcyYjY3NTI1NWE0YmIyODkzNTEzMDAwNTg0IF0KCk9uIGkzODYs IHRoZSBiYXljb21fZXBwIGRyaXZlciB3YW50cyB0byBpbnNwZWN0IFg4NiBDUFUgZmVhdHVyZXMg KFRTQykKYW5kIHRoZW4gYWN0IG9uIHRoYXQgZGF0YSwgYnV0IHRoYXQgaW5mbyBpcyBub3QgYXZh aWxhYmxlIHdoZW4gcnVubmluZwpvbiBVTUwsIHNvIHByZXZlbnQgdGhhdCB0ZXN0IGFuZCBkbyB0 aGUgZGVmYXVsdCBhY3Rpb24uCgpQcmV2ZW50cyB0aGlzIGJ1aWxkIGVycm9yIG9uIFVNTCArIGkz ODY6CgouLi9kcml2ZXJzL25ldC9oYW1yYWRpby9iYXljb21fZXBwLmM6IEluIGZ1bmN0aW9uIOKA mGVwcF9iaOKAmToKLi4vZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jOjYzMDo2OiBl cnJvcjogaW1wbGljaXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24g4oCYYm9vdF9jcHVfaGFz4oCZ OyBkaWQgeW91IG1lYW4g4oCYZ2V0X2NwdV9tYXNr4oCZPyBbLVdlcnJvcj1pbXBsaWNpdC1mdW5j dGlvbi1kZWNsYXJhdGlvbl0KICBpZiAoYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX1RTQykpICAg XAogICAgICBeCi4uL2RyaXZlcnMvbmV0L2hhbXJhZGlvL2JheWNvbV9lcHAuYzo2NTg6Mjogbm90 ZTogaW4gZXhwYW5zaW9uIG9mIG1hY3JvIOKAmEdFVFRJQ0vigJkKICBHRVRUSUNLKHRpbWUxKTsK CkZpeGVzOiA2OGY1ZDNmM2I2NTQgKCJ1bTogYWRkIFBDSSBvdmVyIHZpcnRpbyBlbXVsYXRpb24g ZHJpdmVyIikKU2lnbmVkLW9mZi1ieTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5v cmc+CkNjOiBsaW51eC11bUBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBKZWZmIERpa2UgPGpkaWtl QGFkZHRvaXQuY29tPgpDYzogUmljaGFyZCBXZWluYmVyZ2VyIDxyaWNoYXJkQG5vZC5hdD4KQ2M6 IEFudG9uIEl2YW5vdiA8YW50b24uaXZhbm92QGNhbWJyaWRnZWdyZXlzLmNvbT4KQ2M6ICJEYXZp ZCBTLiBNaWxsZXIiIDxkYXZlbUBkYXZlbWxvZnQubmV0PgpDYzogSmFrdWIgS2ljaW5za2kgPGt1 YmFAa2VybmVsLm9yZz4KQ2M6IFRob21hcyBTYWlsZXIgPHQuc2FpbGVyQGFsdW1uaS5ldGh6LmNo PgpDYzogbGludXgtaGFtc0B2Z2VyLmtlcm5lbC5vcmcKU2lnbmVkLW9mZi1ieTogRGF2aWQgUy4g TWlsbGVyIDxkYXZlbUBkYXZlbWxvZnQubmV0PgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8 c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5j IHwgNiArKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jIGIvZHJp dmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jCmluZGV4IDQ0MzVhMTE5NTE5NC4uOGVhOGQ1 MGY4MWM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC9oYW1yYWRpby9iYXljb21fZXBwLmMKKysr IGIvZHJpdmVycy9uZXQvaGFtcmFkaW8vYmF5Y29tX2VwcC5jCkBAIC02MjMsMTYgKzYyMywxNiBA QCBzdGF0aWMgaW50IHJlY2VpdmUoc3RydWN0IG5ldF9kZXZpY2UgKmRldiwgaW50IGNudCkKIAog LyogLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tICovCiAKLSNpZmRlZiBfX2kzODZfXworI2lmIGRlZmluZWQoX19pMzg2 X18pICYmICFkZWZpbmVkKENPTkZJR19VTUwpCiAjaW5jbHVkZSA8YXNtL21zci5oPgogI2RlZmlu ZSBHRVRUSUNLKHgpCQkJCQkJXAogKHsJCQkJCQkJCVwKIAlpZiAoYm9vdF9jcHVfaGFzKFg4Nl9G RUFUVVJFX1RTQykpCQkJXAogCQl4ID0gKHVuc2lnbmVkIGludClyZHRzYygpOwkJCVwKIH0pCi0j ZWxzZSAvKiBfX2kzODZfXyAqLworI2Vsc2UgLyogX19pMzg2X18gICYmICFDT05GSUdfVU1MICov CiAjZGVmaW5lIEdFVFRJQ0soeCkKLSNlbmRpZiAvKiBfX2kzODZfXyAqLworI2VuZGlmIC8qIF9f aTM4Nl9fICAmJiAhQ09ORklHX1VNTCAqLwogCiBzdGF0aWMgdm9pZCBlcHBfYmgoc3RydWN0IHdv cmtfc3RydWN0ICp3b3JrKQogewotLSAKMi4zMy4wCgoKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC11bSBtYWlsaW5nIGxpc3QKbGludXgtdW1A bGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2xpbnV4LXVtCg== 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 EA40FC433EF for ; Mon, 25 Oct 2021 19:50:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7C8F60C49 for ; Mon, 25 Oct 2021 19:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236123AbhJYTw2 (ORCPT ); Mon, 25 Oct 2021 15:52:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:37368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237753AbhJYTp4 (ORCPT ); Mon, 25 Oct 2021 15:45:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 67A38611AE; Mon, 25 Oct 2021 19:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635190773; bh=x78di4Y7cau7oQeUDkoo6UR9fiq7T4VUxl685vD7tkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I2GorxHfUzq1wPWvRMsH+a5EIrG29etv8trXzgAOPQAd8uI6GdgzvXuMHWwLagAog WXVd/k/gUF6p8FaK8sVi9upnRiRf4E6AJ+AHbHMFALLNAXs9aKckgNi32BAxuaJEOb tdjbDcEKCYuhm18LNqJcKYVfnOCq31j6C2bqj8P0= 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 , "David S. Miller" , Jakub Kicinski , Thomas Sailer , linux-hams@vger.kernel.org, Sasha Levin Subject: [PATCH 5.14 038/169] hamradio: baycom_epp: fix build for UML Date: Mon, 25 Oct 2021 21:13:39 +0200 Message-Id: <20211025191022.696563287@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211025191017.756020307@linuxfoundation.org> References: <20211025191017.756020307@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 0a9bb11a5e298e72b675255a4bb2893513000584 ] On i386, the baycom_epp driver wants to inspect X86 CPU features (TSC) and then act on that data, but that info is not available when running on UML, so prevent that test and do the default action. Prevents this build error on UML + i386: ../drivers/net/hamradio/baycom_epp.c: In function ‘epp_bh’: ../drivers/net/hamradio/baycom_epp.c:630:6: error: implicit declaration of function ‘boot_cpu_has’; did you mean ‘get_cpu_mask’? [-Werror=implicit-function-declaration] if (boot_cpu_has(X86_FEATURE_TSC)) \ ^ ../drivers/net/hamradio/baycom_epp.c:658:2: note: in expansion of macro ‘GETTICK’ GETTICK(time1); 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 Cc: Thomas Sailer Cc: linux-hams@vger.kernel.org Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/hamradio/baycom_epp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 4435a1195194..8ea8d50f81c4 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -623,16 +623,16 @@ static int receive(struct net_device *dev, int cnt) /* --------------------------------------------------------------------- */ -#ifdef __i386__ +#if defined(__i386__) && !defined(CONFIG_UML) #include #define GETTICK(x) \ ({ \ if (boot_cpu_has(X86_FEATURE_TSC)) \ x = (unsigned int)rdtsc(); \ }) -#else /* __i386__ */ +#else /* __i386__ && !CONFIG_UML */ #define GETTICK(x) -#endif /* __i386__ */ +#endif /* __i386__ && !CONFIG_UML */ static void epp_bh(struct work_struct *work) { -- 2.33.0