diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h index 2daa6de1af08..b1ec0ca761a9 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/sdt.h @@ -34,12 +34,12 @@ /* CSTYLED */ SDT_PROBE_DECLARE(sdt, , , set__error); -#define SET_ERROR(err) \ - ((sdt_sdt___set__error->id ? \ - (*sdt_probe_func)(sdt_sdt___set__error->id, \ - (uintptr_t)err, 0, 0, 0, 0) : 0), err) -#else -#define SET_ERROR(err) (err) #endif +#define SET_ERROR(err) ({ \ + int _err = (err); \ + printf("SET_ERROR %s %s:%d %d\n", __func__, __FILE__, __LINE__, _err); \ + _err; \ +}) + #endif /* _OPENSOLARIS_SYS_SDT_H_ */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h index a106967d0725..1f24d9f5e059 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/simd.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/simd.h @@ -551,14 +551,14 @@ zfs_sha512_available(void) #elif defined(__powerpc__) -#define kfpu_allowed() 1 +#define kfpu_allowed() 0 #define kfpu_initialize(tsk) do {} while (0) #define kfpu_begin() do {} while (0) #define kfpu_end() do {} while (0) -#define PPC_FEATURE_HAS_ALTIVEC 0x10000000 -#define PPC_FEATURE_HAS_VSX 0x00000080 -#define PPC_FEATURE2_ARCH_2_07 0x80000000 +#define PPC_FEATURE_HAS_ALTIVEC 0x00000000 +#define PPC_FEATURE_HAS_VSX 0x00000000 +#define PPC_FEATURE2_ARCH_2_07 0x00000000 static inline boolean_t zfs_altivec_available(void)