From b551f3ccb68916d2efeaf77dec98064e0510e71a Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 13 Nov 2021 18:02:15 +0100 Subject: [PATCH 286/325] ELECTRO_BLOAT i386: Ditch "options KVA_PAGES=512" It seems to break the build and it looks like it's no longer needed anyway. [fk@elektrobier3 ~]$ time BUILD_JAIL=ElectroBSD-i386 sh /usr/src/reproduce-electrobsd.sh [...] cc -target i386-unknown-freebsd12.3 --sysroot=/usr/obj/usr/src/i386.i386/tmp -B/usr/obj/usr/src/i386.i386/tmp/usr/bin -c -x assembler-with-cpp -DLOCORE -O -pipe -g -nostdinc -I. -I/usr/src/sys -I/usr/src/sys/contrib/ck/include -I/usr/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -MD -MF.depend.locore.o -MTlocore.o -fdebug-prefix-map=./machine=/usr/src/sys/i386/include -fdebug-prefix-map=./x86=/usr/src/sys/x86/include -mno-mmx -mno-sse -msoft-float -ffreestanding -fwrapv -fstack-protector -gdwarf-2 -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign -D__printf__=__freebsd_kprintf__ -Wmissing-include-dirs -fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error=tautological-compare -Wno-error=empty-body -Wno-error=parentheses-equality -Wno-error=unused-function -Wno-error=pointer-sign -Wno-error=shift-negative-value -Wno-address-of-packed-member -Wno-format-zero-length -mno-aes -mno-avx -std=iso9899:1999 -Werror /usr/src/sys/i386/i386/locore.s In file included from /usr/src/sys/i386/i386/locore.s:51: ./machine/pmap.h:118:9: error: 'KVA_PAGES' macro redefined [-Werror,-Wmacro-redefined] #define KVA_PAGES (256*4) ^ ./opt_global.h:9:9: note: previous definition is here #define KVA_PAGES 512 ^ 1 error generated. *** Error code 1 Stop. make[2]: stopped in /usr/obj/usr/src/i386.i386/sys/ELECTRO_BLOAT *** Error code 1 Stop. make[1]: stopped in /usr/src *** Error code 1 Stop. make: stopped in /usr/src 31.22s real 11.87s user 6.65s sys 43148 maximum resident set size 1865 average shared memory size 54 average unshared data size 128 average unshared stack size 417404 page reclaims 1163 page faults 0 swaps 53338 block input operations 126 block output operations 0 messages sent 0 messages received 0 signals received 12584 voluntary context switches 46442 involuntary context switches ElectroBSD-i386: removed Script done, output file is /var/log/buildlogs/reprolog-2021-11-12_20:58 Script started, output file is /var/log/buildlogs/reprolog-2021-11-12_20:58 Script done, output file is /var/log/buildlogs/reprolog-2021-11-12_20:58 real 641m19.404s user 712m47.369s sys 24m25.377s Obtained from: ElectroBSD --- sys/i386/conf/ELECTRO_BLOAT | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/i386/conf/ELECTRO_BLOAT b/sys/i386/conf/ELECTRO_BLOAT index 9f9df8483aaa..efeb7393f394 100644 --- a/sys/i386/conf/ELECTRO_BLOAT +++ b/sys/i386/conf/ELECTRO_BLOAT @@ -328,7 +328,3 @@ device crypto # Required by IPSEC # For details see UPDATING entry 20121223. After r286288 it's # probably no longer necessary, but for now we keep it anyway. options KSTACK_PAGES=4 - -# Increase the size of the kernel virtual address space -# so ZFS can cache more stuff. -options KVA_PAGES=512 -- 2.32.0