From nobody Thu Oct 03 16:07:54 2024 X-Original-To: dev-commits-src-all@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 4XKGmV6nKkz5YVSM; Thu, 03 Oct 2024 16:07:54 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XKGmV6GQcz4lpN; Thu, 3 Oct 2024 16:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727971674; 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=A+Jyu1AUKzYZVanX1iYy/V6cq8fDr2ytEIew6k6bJWg=; b=BejUYWcXGs0vFJh1lNkBTb3mKRsRugmLkm2fMO1LQ8EL9dOrnZLDHvOs6+G9Vt/dK3Jevs 3LQ2ZvCS6E/eM/GK/D85JZncf5K/qKvKQXYtohHixTnSHNA9dj+tL4hsar25AYoXuUNDaF Qne2W75CkIEswaAJXZH8xUaLxG3WQ6A8x9IV8nkDMC1NRrGBzL7kyLum0Q1Et4We2yl0cE ra0tqmOtUaagoTTLiLrATWn9XInRxU+6sQl8rl6lqWfFY7hdrAU3PXYoXDPa2b/gUN62AR lsLRpFrZDQZLdwV2UOajy95oLuaC38a9sbXvOZ9qKw2ctV8/qwPmfT6GAt7mQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727971674; 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=A+Jyu1AUKzYZVanX1iYy/V6cq8fDr2ytEIew6k6bJWg=; b=DMH/TC4vqJTJDM444st6fohGiiW8dvTBnHUUP38XUihtmf8V0rg/JlvbOwn249l0cQHGJ0 JsYz7KIYPHhHqdcERWRrLpvNttVc7gDxIDgf3kOvIWwqrrmvSsCGFNZjuknd7MlDH090Mq rLSG0G1AeCDNAtCYFxMeeVKDI9qQ/17IOod/1QFXQTpTmC2MAtVwYYvMAfhqldiQi1MtHS 6rPgXyevQFaWrUjI+irAY9SGFT63IqTXofwxiYGXcV3gfmPTYl8dp//LUqUgwLhQ/fegYG 0jlCAoDy2YWvJN5K/fOANNZF5Noh1oLOE6nJuX40mhnhl6deR2DWhZXfzWT2gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727971674; a=rsa-sha256; cv=none; b=ZOKaX0SuzyfBbDlbSajiypg5s6cszU5xTMS6d4EAHKnvCnpvOXFWvaDl/yzhFoFTVzyygK RUIM7URrx2xRGR13zmZnkjyl00MTFbW3xIdYeQrStXlaFfJsNbdp4yuC3bZKdDR84uD2s8 t+5JgVmNvuZwNvEHEVix4SNjo6NXUGfGeSnvxAh07in4t5HvfkWRbYMxiW33sQC4TB43Xm d6FilGzelw6jYCVAbKvvJOZNG1fRPisCuFRflNiu3mram7UgPkcBKUjNAGHIE7xVpjNm64 CdAqMeKyHrCJHtZ/6w89DrMpCiqJyStBN8SaCk+sKlbtk5AMI0g2HUaANV1Pkg== 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 4XKGmV5sYMzx5T; Thu, 3 Oct 2024 16:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493G7s3K020329; Thu, 3 Oct 2024 16:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493G7sZI020326; Thu, 3 Oct 2024 16:07:54 GMT (envelope-from git) Date: Thu, 3 Oct 2024 16:07:54 GMT Message-Id: <202410031607.493G7sZI020326@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: 59f5f100b774 - main - openzfs: Reduce local diffs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 59f5f100b774de8824fb2fc1a8a11a93bbc2dafd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59f5f100b774de8824fb2fc1a8a11a93bbc2dafd commit 59f5f100b774de8824fb2fc1a8a11a93bbc2dafd Author: John Baldwin AuthorDate: 2024-10-03 16:07:43 +0000 Commit: John Baldwin CommitDate: 2024-10-03 16:07:43 +0000 openzfs: Reduce local diffs These are all local diffs that have no functional change. Reviewed by: mav, emaste Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D46530 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h | 2 -- sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h | 1 - sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h index 2fd806e1a0b5..cf3c712c6af2 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_powerpc.h @@ -49,9 +49,7 @@ #include #include -/* FreeBSD doesn't support floating point on powerpc kernel yet */ #define kfpu_allowed() 0 - #define kfpu_initialize(tsk) do {} while (0) #define kfpu_begin() do {} while (0) #define kfpu_end() do {} while (0) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h index 6b4f4011ee48..8e93b558dfe8 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h @@ -40,7 +40,6 @@ #define kfpu_allowed() 1 #define kfpu_initialize(tsk) do {} while (0) - #define kfpu_begin() { \ if (__predict_false(!is_fpu_kern_thread(0))) \ fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX);\ diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 9e8a4d62f641..4d539461886b 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -686,7 +686,7 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) * The check below facilitates the idiom of repeating calls until the * count to return is 0. */ - if (zfs_uio_offset(&uio) == 3 * sizeof(entry)) { + if (zfs_uio_offset(&uio) == 3 * sizeof (entry)) { return (0); }