From patchwork Tue Aug 31 07:27:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 1522461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=nQOQxcdt; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=sipsolutions.net header.i=@sipsolutions.net header.a=rsa-sha256 header.s=mail header.b=wLnkofFU; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GzJpr080Qz9sR4 for ; Tue, 31 Aug 2021 17:34:12 +1000 (AEST) 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: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:In-Reply-To:References: List-Owner; bh=Hhmaj94V1TqChamXzl17cRUqr0AYaXjfAT6/XtMX/p4=; b=nQOQxcdtSCmMB9 LoNy8xRJ3LHeIrZOqRzi12/LWbNaXDlfRKxiQrFVbGaXHMCMArxgh0ee92p7vEqvkWYtxGuZPXK04 Cxfu1QKdW9c39N8ODv/sGqjVute1HwFOv68LiJQr+Oo9rTsQ+g33fSfAxnf6uzGQaMVQr9Itf6G4n rhM2lHkukuikZ+AwuB/FfxbUdOsRl/EvlHusNZdMc6dz7Y+iMVkazVUGiCjIIFDVeAFnLYt7UFRn8 uDO288pycgBZ1FkM0CqwXgoWRPfFMXB+/a0N7g6HD/z8VYx9Lq1NmdF6AzjH5inHTYKKI6RgNUMvE 4mdgwyStlMKs+GwoLCCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKyHN-001gBQ-Aq; Tue, 31 Aug 2021 07:33:57 +0000 Received: from s3.sipsolutions.net ([2a01:4f8:191:4433::2] helo=sipsolutions.net) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mKyBd-001drA-4E for linux-um@lists.infradead.org; Tue, 31 Aug 2021 07:28:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From:Content-Type:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-To:Resent-Cc: Resent-Message-ID:In-Reply-To:References; bh=ANS/NifnqpAZvSxrl25h3CAUEdFnnVY/6/0TuiClVio=; t=1630394880; x=1631604480; b=wLnkofFUz408vimTOWmFBFPdZvhNoXGHGzINVSffR1yr1VmxXKXyUzXhoap7R0M8xo5wa85QYiv GwkH/bxb1fUaf8xgb6OkXJCS2FHOa5Z2wtqcRe/pVcJl1B4Sk6JFYQd3chaY/BoabsU750x8W0Gyw TZ0T20YX14VeGn9hORYLr42X9/fDv8hGG40dukVi4mDSnIu+FlPENwY5cjTsbCH3Eo7ARo45cPqOZ CkCdrlY1hGQuZOHknN/c9jMqCjOxkQR/mwwiSI/JSBB+HrWeS/wQchqdp4QXXFMJoOVlsLhBqKl7F TcZkJuEzF+L+WboTYrgq8WLCvR1jCxsK2B3A==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) (envelope-from ) id 1mKyBZ-000Zt6-LC; Tue, 31 Aug 2021 09:27:57 +0200 From: Johannes Berg To: linux-um@lists.infradead.org Cc: Johannes Berg , kernel test robot Subject: [PATCH] um: fix ndelay/udelay defines Date: Tue, 31 Aug 2021 09:27:53 +0200 Message-Id: <20210831092753.4ea66dc7dff8.Ife5ad95810e75d88a9c8fae6cf1314e7486bfe19@changeid> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210831_002801_222213_1A0E6781 X-CRM114-Status: GOOD ( 10.73 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Johannes Berg Many places in the kernel use 'udelay' as an identifier, and are broken with the current "#define udelay um_udelay". Fix this by adding an argument to the macro, and do the same to 'ndelay' as well, j [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Johannes Berg Many places in the kernel use 'udelay' as an identifier, and are broken with the current "#define udelay um_udelay". Fix this by adding an argument to the macro, and do the same to 'ndelay' as well, just in case. Fixes: 0bc8fb4dda2b ("um: Implement ndelay/udelay in time-travel mode") Reported-by: kernel test robot Signed-off-by: Johannes Berg --- arch/um/include/asm/delay.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/include/asm/delay.h b/arch/um/include/asm/delay.h index 56fc2b8f2dd0..e79b2ab6f40c 100644 --- a/arch/um/include/asm/delay.h +++ b/arch/um/include/asm/delay.h @@ -14,7 +14,7 @@ static inline void um_ndelay(unsigned long nsecs) ndelay(nsecs); } #undef ndelay -#define ndelay um_ndelay +#define ndelay(n) um_ndelay(n) static inline void um_udelay(unsigned long usecs) { @@ -26,5 +26,5 @@ static inline void um_udelay(unsigned long usecs) udelay(usecs); } #undef udelay -#define udelay um_udelay +#define udelay(n) um_udelay(n) #endif /* __UM_DELAY_H */