diff options
| author | Alfredo Dal'Ava Junior <alfredo@FreeBSD.org> | 2023-03-12 06:20:11 +0000 |
|---|---|---|
| committer | Alfredo Dal'Ava Junior <alfredo@FreeBSD.org> | 2023-03-12 06:20:11 +0000 |
| commit | 63715498ac6b003a024e1fd0eefbc0db504f126e (patch) | |
| tree | ca89d2d94457bed29f715151ebc74e7ee3f29316 | |
| parent | c5c9d980c4b0ca3866cb2ad67ec3f7111f5c4285 (diff) | |
| download | src-63715498ac6b.tar.gz src-63715498ac6b.zip | |
powerpc: enable ZFS on 32 bit powerpc/powerpcspe
Enable ZFS on powerpc 32 bit since it appears to build and work
correctly.
MFC after: 3 weeks
Relnotes: yes
| -rw-r--r-- | share/mk/src.opts.mk | 5 | ||||
| -rw-r--r-- | sys/conf/kern.opts.mk | 5 | ||||
| -rw-r--r-- | sys/modules/Makefile | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 7cd1ef9731fc..7e865b31db25 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -356,11 +356,6 @@ __DEFAULT_NO_OPTIONS+=OPENMP BROKEN_OPTIONS+= OFED .endif -# ZFS is broken on 32-bit powerpc (missing atomics), but works on 64-bit -.if ${__T} == "powerpc" || ${__T} == "powerpcspe" -BROKEN_OPTIONS+= ZFS LOADER_ZFS -.endif - .include <bsd.mkopt.mk> # diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 25057dcbb8d9..35ce97fae633 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -78,11 +78,6 @@ __DEFAULT_NO_OPTIONS = \ BROKEN_OPTIONS+= INIT_ALL_ZERO .endif -# ZFS is broken on 32-bit powerpc, missing atomics -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" -BROKEN_OPTIONS+= ZFS -.endif - # Broken on 32-bit arm, kernel module compile errors .if ${MACHINE_CPUARCH} == "arm" BROKEN_OPTIONS+= OFED diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3737dddb57ab..421fd1d3dd32 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -643,7 +643,7 @@ _mpr= mpr SUBDIR+= tests .endif -.if ${MK_ZFS} != "no" || (defined(ALL_MODULES) && ${MACHINE_CPUARCH} != "powerpc") +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) SUBDIR+= zfs .endif |