kernel - Optimize spinlocks for 48-core contention
[dragonfly.git] / Makefile_upgrade.inc
index 8ed7fc9..8af9ff6 100644 (file)
@@ -1588,15 +1588,6 @@ TO_REMOVE+=/usr/share/man/cat9/memoryallocators.9.gz
 TO_REMOVE+=/usr/share/man/man9/memoryallocators.9.gz
 TO_REMOVE+=/usr/share/man/cat4/rc.4.gz
 TO_REMOVE+=/usr/share/man/man4/rc.4.gz
-TO_REMOVE+=/usr/bin/zegrep
-TO_REMOVE+=/usr/share/man/cat1/zegrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zegrep.1.gz
-TO_REMOVE+=/usr/bin/zfgrep
-TO_REMOVE+=/usr/share/man/cat1/zfgrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zfgrep.1.gz
-TO_REMOVE+=/usr/bin/zgrep
-TO_REMOVE+=/usr/share/man/cat1/zgrep.1.gz
-TO_REMOVE+=/usr/share/man/man1/zgrep.1.gz
 TO_REMOVE+=/usr/include/dev/disk/mpt/mpilib/fc_log.h
 TO_REMOVE+=/boot/kernel/ipl.ko
 TO_REMOVE+=/etc/periodic/security/510.ipfdenied
@@ -1696,8 +1687,8 @@ TO_REMOVE+=/usr/share/man/cat1/sasc.1.gz
 TO_REMOVE+=/usr/share/man/cat1/sgsc.1.gz
 TO_REMOVE+=/usr/share/man/cat1/xten.1.gz
 TO_REMOVE+=/usr/share/man/cat4/aha.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386.asc.4.gz
-TO_REMOVE+=/usr/share/man/cat4/i386.dgb.4.gz
+TO_REMOVE+=/usr/share/man/cat4/i386/asc.4.gz
+TO_REMOVE+=/usr/share/man/cat4/i386/dgb.4.gz
 TO_REMOVE+=/usr/share/man/cat4/i386/el.4.gz
 TO_REMOVE+=/usr/share/man/cat4/i386/gsc.4.gz
 TO_REMOVE+=/usr/share/man/cat4/i386/ie.4.gz
@@ -1733,6 +1724,9 @@ TO_REMOVE+=/usr/share/man/man8/xten.8.gz
 TO_REMOVE+=/usr/bin/gprof4
 TO_REMOVE+=/usr/share/misc/gprof.callg
 TO_REMOVE+=/usr/share/misc/gprof.flat
+TO_REMOVE+=/usr/share/man/cat4/i386/ndis.4.gz
+TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz
+TO_REMOVE+=/usr/include/vfs/gnu
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys
@@ -1775,9 +1769,3 @@ TO_REMOVE+=/usr/share/man/man4/rum.4.gz
 TO_REMOVE+=/boot/modules/if_ural.ko
 TO_REMOVE+=/usr/share/man/cat4/ural.4.gz
 TO_REMOVE+=/usr/share/man/man4/ural.4.gz
-TO_REMOVE+=/boot/modules/ndis.ko
-TO_REMOVE+=/usr/share/man/cat4/i386/ndis.4.gz
-TO_REMOVE+=/usr/share/man/man4/i386/ndis.4.gz
-TO_REMOVE+=/usr/sbin/ndiscvt
-TO_REMOVE+=/usr/share/man/cat8/ndiscvt.8.gz
-TO_REMOVE+=/usr/share/man/man8/ndiscvt.8.gz