The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=59f5f100b774de8824fb2fc1a8a11a93bbc2dafd
commit 59f5f100b774de8824fb2fc1a8a11a93bbc2dafd Author: John Baldwin <[email protected]> AuthorDate: 2024-10-03 16:07:43 +0000 Commit: John Baldwin <[email protected]> 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 <machine/pcb.h> #include <machine/cpu.h> -/* 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); }
