D46530.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46530.diff
View Options

	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
	--- 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
	--- 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
	--- 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 @@
	* 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);
	}