From nobody Sat Apr 9 00:28:07 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id ED04A1AACE07; Sat, 9 Apr 2022 00:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZwvD1kGKz3pH4; Sat, 9 Apr 2022 00:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0OusJsknVE5NgSkz01wY8tIlGJe5UEr0AibYZnMnDE=; b=NHOHZv1ooyZAqqPGoGFp7WgG/3aBQDf6oQk4ulhlkUZBK4pxAmgKEZZuzqccwOllovRH6d /udKIC17lDQ0uy+4HoRJIksDKSsLyNpA87Bj+5AmqoOni7degYF1IZO+j90yVNJFIk1Kw6 lxiQ5HfJWcdH3EYMH+HuTFxrqjKBUMnZqDRX6O9xoVmB9NZrcAckSOlbU3EFDF/DP9Lktc BkHOhBOr9CjEFEKMgN6wvvwVQMpS4+kVk/oSw20OHsj69t5jA72SV2HXvR6T2h0Auj3Dxt b1TWb9dLH+xb5xBUUsZPdCogx/BXfhQy+zp5Y2pgvHFvcpE4mthL2wdXIuym2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB42676C0; Sat, 9 Apr 2022 00:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2390S7AS056919; Sat, 9 Apr 2022 00:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2390S7Ho056918; Sat, 9 Apr 2022 00:28:07 GMT (envelope-from git) Date: Sat, 9 Apr 2022 00:28:07 GMT Message-Id: <202204090028.2390S7Ho056918@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d08cb45362e0 - main - iflib: Use empty inline functions for prefetch*() on non-x86. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d08cb45362e0c00f29bf0a1f9c639f22042df34b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649464088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0OusJsknVE5NgSkz01wY8tIlGJe5UEr0AibYZnMnDE=; b=AfR6pnkzynf4iBCpZfdaheY2hAPXPkNX+hHJ0YRak8fxVZG579UTPoZqQ5wRvHiXM3I2oA 0d3VAiQ7rqsS9G/G8yOOA0e+WUzfchslFhrDnxxalIX+7i22Gx7gPMmUPfvDUKQewj/477 kL+nW7H4AM5FJ7i05ln5H0FKN6Ta5sifE352h6eleMsheykgiHG27Wvdg+85LKixgyEzul wbNyNvs67n28VjoItdqaSKqUEV0FL42DP5in4G/sH9RgAGJNIBZ6RP58R27JRptCZsW0/f OC1tTk3DCmBcnEDqzA/2D+Es2iKLKdoCxCgGmBLXBfolrwzXYMxdze9iSArvKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649464088; a=rsa-sha256; cv=none; b=nIc58rGSi9yDoNTSHcHCH7QNXcomQXneK6/V7MBV3rnDnoeBAltJwrq6SBmGpwJyYhjYic mSqTPiR1Jy+dAWh9oi66Qqjpr9Q70XHvetKhqahCU1pehJm1vn2f8TqdIrgccMMSTGcEGm 6Ar1bhG/XoC/GEs6RV8QrQ9JZsdBlspXTpy0DCpJgs+CW/7dE997Lldyj7thHxySwqwGOF wMZ2okyx5eRhETYQ5WqFymeZxMe0ShcVrbiLRa4ADfjAW3ge9MwqOo94qlQ7JMYa1VtcC5 kxjjrQBpleTliiQm2gEV/4ppUEo/Ncf/lvanSohcL/yri9g+tXvuvB5wJCOz6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d08cb45362e0c00f29bf0a1f9c639f22042df34b commit d08cb45362e0c00f29bf0a1f9c639f22042df34b Author: John Baldwin AuthorDate: 2022-04-09 00:25:14 +0000 Commit: John Baldwin CommitDate: 2022-04-09 00:25:14 +0000 iflib: Use empty inline functions for prefetch*() on non-x86. This avoids warnings about unused variables in expressions passed to prefetch*(). --- sys/net/iflib.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 2971a22d799e..d088571b09c0 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1399,6 +1399,7 @@ prefetch(void *x) { __asm volatile("prefetcht0 %0" :: "m" (*(unsigned long *)x)); } + static __inline void prefetch2cachelines(void *x) { @@ -1408,8 +1409,15 @@ prefetch2cachelines(void *x) #endif } #else -#define prefetch(x) -#define prefetch2cachelines(x) +static __inline void +prefetch(void *x) +{ +} + +static __inline void +prefetch2cachelines(void *x) +{ +} #endif static void