Module Name: src
Committed By: martin
Date: Sat Jan 17 12:10:56 UTC 2015
Modified Files:
src/distrib/sets/lists/comp [netbsd-7]: mi
src/share/man/man9 [netbsd-7]: Makefile malloc.9
src/sys/compat/common [netbsd-7]: compat_util.c if_43.c kern_time_50.c
uipc_syscalls_43.c
src/sys/compat/freebsd [netbsd-7]: freebsd_exec_elf32.c freebsd_file.c
freebsd_ipc.c freebsd_misc.c
src/sys/compat/linux/arch/alpha [netbsd-7]: linux_machdep.c
linux_pipe.c
src/sys/compat/linux/arch/arm [netbsd-7]: linux_machdep.c
linux_ptrace.c
src/sys/compat/linux/arch/i386 [netbsd-7]: linux_machdep.c
linux_ptrace.c
src/sys/compat/linux/arch/mips [netbsd-7]: linux_machdep.c
linux_ptrace.c
src/sys/compat/linux/arch/powerpc [netbsd-7]: linux_machdep.c
linux_ptrace.c
src/sys/compat/linux/common [netbsd-7]: linux_exec.c linux_exec_aout.c
linux_fadvise64.c linux_fadvise64_64.c linux_file.c linux_llseek.c
linux_misc_notalpha.c linux_pipe.c linux_sched.c linux_signal.c
linux_socket.c linux_socketcall.c linux_uselib.c
src/sys/compat/linux32/common [netbsd-7]: linux32_misc.c
src/sys/compat/svr4 [netbsd-7]: svr4_exec_elf32.c svr4_exec_elf64.c
svr4_fcntl.c svr4_filio.c svr4_ioctl.c svr4_ipc.c svr4_schedctl.c
svr4_signal.c svr4_sockio.c svr4_termios.c svr4_ttold.c
src/sys/fs/cd9660 [netbsd-7]: cd9660_node.c cd9660_util.c
src/sys/fs/puffs [netbsd-7]: puffs_compat.c puffs_msgif.c puffs_node.c
puffs_subr.c puffs_vfsops.c
src/sys/fs/udf [netbsd-7]: udf_strat_bootstrap.c
src/sys/kern [netbsd-7]: kern_exec.c
src/sys/miscfs/fdesc [netbsd-7]: fdesc_vfsops.c
src/sys/miscfs/genfs [netbsd-7]: layer_subr.c layer_vfsops.c
src/sys/miscfs/nullfs [netbsd-7]: null_vfsops.c
src/sys/miscfs/overlay [netbsd-7]: overlay_vfsops.c overlay_vnops.c
src/sys/miscfs/procfs [netbsd-7]: procfs_subr.c procfs_vfsops.c
src/sys/miscfs/umapfs [netbsd-7]: umap_subr.c umap_vfsops.c
umap_vnops.c
src/sys/netinet [netbsd-7]: if_atm.c in_pcb.c raw_ip.c tcp_output.c
tcp_sack.c tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c
src/sys/netinet6 [netbsd-7]: dest6.c in6_ifattach.c in6_pcb.c
ip6_forward.c udp6_output.c
src/sys/sys [netbsd-7]: malloc.h mallocvar.h
src/sys/ufs/chfs [netbsd-7]: chfs_vfsops.c chfs_vnode.c
src/sys/ufs/ext2fs [netbsd-7]: ext2fs_readwrite.c ext2fs_vfsops.c
ext2fs_vnops.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #427):
sys/compat/svr4/svr4_schedctl.c: revision 1.8
sys/netinet/tcp_timer.c: revision 1.88
sys/miscfs/genfs/layer_vfsops.c: revision 1.45
sys/compat/svr4/svr4_ioctl.c: revision 1.37
sys/ufs/chfs/chfs_vfsops.c: revision 1.14
sys/miscfs/fdesc/fdesc_vfsops.c: revision 1.91
sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.30
sys/compat/common/kern_time_50.c: revision 1.28
sys/netinet6/ip6_forward.c: revision 1.74
sys/miscfs/umapfs/umap_vnops.c: revision 1.57
sys/compat/svr4/svr4_fcntl.c: revision 1.74
distrib/sets/lists/comp/mi: revision 1.1931
sys/netinet6/udp6_output.c: revision 1.46
sys/fs/puffs/puffs_compat.c: revision 1.3
sys/fs/udf/udf_rename.c: revision 1.11
sys/compat/svr4/svr4_filio.c: revision 1.24
sys/fs/udf/udf_rename.c: revision 1.12
sys/netinet/tcp_usrreq.c: revision 1.202
sys/miscfs/umapfs/umap_subr.c: revision 1.29
sys/compat/linux/common/linux_fadvise64.c: revision 1.3
sys/netinet/if_atm.c: revision 1.34
sys/miscfs/procfs/procfs_subr.c: revision 1.106
sys/miscfs/genfs/layer_subr.c: revision 1.37
sys/netinet/tcp_sack.c: revision 1.30
sys/compat/freebsd/freebsd_misc.c: revision 1.33
sys/compat/freebsd/freebsd_file.c: revision 1.33
sys/ufs/chfs/chfs_vnode.c: revision 1.12
sys/compat/svr4/svr4_ttold.c: revision 1.34
sys/compat/linux/common/linux_file.c: revision 1.114
sys/compat/linux/arch/mips/linux_machdep.c: revision 1.43
sys/compat/linux/common/linux_signal.c: revision 1.76
sys/compat/common/compat_util.c: revision 1.46
sys/compat/linux/arch/arm/linux_ptrace.c: revision 1.18
sys/compat/svr4/svr4_sockio.c: revision 1.36
sys/compat/linux/arch/arm/linux_machdep.c: revision 1.32
sys/compat/svr4/svr4_signal.c: revision 1.66
sys/kern/kern_exec.c: revision 1.410
sys/fs/puffs/puffs_vfsops.c: revision 1.115
sys/compat/svr4/svr4_exec_elf64.c: revision 1.15
sys/compat/linux/arch/i386/linux_machdep.c: revision 1.159
sys/compat/linux/arch/alpha/linux_machdep.c: revision 1.50
sys/compat/linux32/common/linux32_misc.c: revision 1.24
sys/netinet/in_pcb.c: revision 1.153
sys/sys/malloc.h: revision 1.116
sys/compat/common/if_43.c: revision 1.9
share/man/man9/Makefile: revision 1.380
sys/netinet/tcp_vtw.c: revision 1.12
sys/miscfs/umapfs/umap_vfsops.c: revision 1.95
sys/ufs/ext2fs/ext2fs_vfsops.c: revision 1.186
sys/compat/common/uipc_syscalls_43.c: revision 1.46
sys/ufs/ext2fs/ext2fs_vnops.c: revision 1.115
sys/fs/puffs/puffs_msgif.c: revision 1.97
sys/compat/svr4/svr4_ipc.c: revision 1.27
sys/compat/linux/common/linux_exec.c: revision 1.117
sys/ufs/ext2fs/ext2fs_readwrite.c: revision 1.66
sys/netinet/tcp_output.c: revision 1.179
sys/compat/svr4/svr4_termios.c: revision 1.28
sys/fs/udf/udf_strat_bootstrap.c: revision 1.4
sys/fs/puffs/puffs_subr.c: revision 1.67
sys/fs/puffs/puffs_node.c: revision 1.36
sys/miscfs/overlay/overlay_vnops.c: revision 1.21
sys/fs/cd9660/cd9660_node.c: revision 1.34
sys/netinet/raw_ip.c: revision 1.146
sys/sys/mallocvar.h: revision 1.13
sys/miscfs/overlay/overlay_vfsops.c: revision 1.63
share/man/man9/malloc.9: revision 1.50
sys/netinet6/dest6.c: revision 1.18
sys/compat/linux/common/linux_uselib.c: revision 1.33
sys/compat/linux/common/linux_socket.c: revision 1.120
share/man/man9/malloc.9: revision 1.51
sys/netinet/tcp_subr.c: revision 1.257
sys/compat/linux/common/linux_socketcall.c: revision 1.45
sys/compat/linux/common/linux_fadvise64_64.c: revision 1.3
sys/compat/freebsd/freebsd_ipc.c: revision 1.17
sys/compat/linux/common/linux_misc_notalpha.c: revision 1.109
sys/compat/linux/arch/alpha/linux_pipe.c: revision 1.17
sys/netinet6/in6_pcb.c: revision 1.132
sys/netinet6/in6_ifattach.c: revision 1.94
sys/compat/svr4/svr4_exec_elf32.c: revision 1.15
sys/miscfs/nullfs/null_vfsops.c: revision 1.90
sys/fs/cd9660/cd9660_util.c: revision 1.12
sys/compat/linux/arch/powerpc/linux_machdep.c: revision 1.48
sys/compat/freebsd/freebsd_exec_elf32.c: revision 1.20
sys/miscfs/procfs/procfs_vfsops.c: revision 1.94
sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.28
sys/compat/linux/common/linux_sched.c: revision 1.67
sys/compat/linux/common/linux_exec_aout.c: revision 1.67
sys/compat/linux/common/linux_pipe.c: revision 1.67
sys/compat/linux/common/linux_llseek.c: revision 1.34
sys/compat/linux/arch/mips/linux_ptrace.c: revision 1.10
Do not uselessly include <sys/malloc.h>.
Cleanup:
- remove struct kmembuckets (dead)
- correctly deadify MALLOC_XX
- remove MALLOC_DEFINE_LIMIT and MALLOC_JUSTDEFINE_LIMIT (dead)
- remove malloc_roundup(), malloc_type_setlimit(), MALLOC_DEFINE_LIMIT()
and MALLOC_JUSTDEFINE_LIMIT() from man 9 malloc
New sentence, new line. Bump date for previous.
Obsolete malloc_roundup(9), malloc_type_setlimit(9) and MALLOC_DEFINE_LIMIT(9)
man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.1906.2.2 -r1.1906.2.3 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.378 -r1.378.2.1 src/share/man/man9/Makefile
cvs rdiff -u -r1.49 -r1.49.2.1 src/share/man/man9/malloc.9
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/compat/common/compat_util.c
cvs rdiff -u -r1.7 -r1.7.2.1 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/compat/common/kern_time_50.c
cvs rdiff -u -r1.44 -r1.44.42.1 src/sys/compat/common/uipc_syscalls_43.c
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/compat/freebsd/freebsd_exec_elf32.c
cvs rdiff -u -r1.32 -r1.32.36.1 src/sys/compat/freebsd/freebsd_file.c
cvs rdiff -u -r1.16 -r1.16.40.1 src/sys/compat/freebsd/freebsd_ipc.c
cvs rdiff -u -r1.32 -r1.32.72.1 src/sys/compat/freebsd/freebsd_misc.c
cvs rdiff -u -r1.49 -r1.49.26.1 \
src/sys/compat/linux/arch/alpha/linux_machdep.c
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/compat/linux/arch/alpha/linux_pipe.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/compat/linux/arch/arm/linux_machdep.c
cvs rdiff -u -r1.17 -r1.17.14.1 src/sys/compat/linux/arch/arm/linux_ptrace.c
cvs rdiff -u -r1.158 -r1.158.4.1 \
src/sys/compat/linux/arch/i386/linux_machdep.c
cvs rdiff -u -r1.28.2.1 -r1.28.2.2 \
src/sys/compat/linux/arch/i386/linux_ptrace.c
cvs rdiff -u -r1.42 -r1.42.30.1 \
src/sys/compat/linux/arch/mips/linux_machdep.c
cvs rdiff -u -r1.9 -r1.9.42.1 src/sys/compat/linux/arch/mips/linux_ptrace.c
cvs rdiff -u -r1.47 -r1.47.12.1 \
src/sys/compat/linux/arch/powerpc/linux_machdep.c
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 \
src/sys/compat/linux/arch/powerpc/linux_ptrace.c
cvs rdiff -u -r1.116 -r1.116.14.1 src/sys/compat/linux/common/linux_exec.c
cvs rdiff -u -r1.66 -r1.66.38.1 src/sys/compat/linux/common/linux_exec_aout.c
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/compat/linux/common/linux_fadvise64.c \
src/sys/compat/linux/common/linux_fadvise64_64.c
cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/compat/linux/common/linux_file.c
cvs rdiff -u -r1.33 -r1.33.58.1 src/sys/compat/linux/common/linux_llseek.c
cvs rdiff -u -r1.108 -r1.108.34.1 \
src/sys/compat/linux/common/linux_misc_notalpha.c
cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/compat/linux/common/linux_pipe.c
cvs rdiff -u -r1.66 -r1.66.4.1 src/sys/compat/linux/common/linux_sched.c
cvs rdiff -u -r1.75 -r1.75.26.1 src/sys/compat/linux/common/linux_signal.c
cvs rdiff -u -r1.119 -r1.119.2.1 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/compat/linux/common/linux_socketcall.c
cvs rdiff -u -r1.30.38.1 -r1.30.38.2 \
src/sys/compat/linux/common/linux_uselib.c
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/compat/linux32/common/linux32_misc.c
cvs rdiff -u -r1.14 -r1.14.62.1 src/sys/compat/svr4/svr4_exec_elf32.c \
src/sys/compat/svr4/svr4_exec_elf64.c
cvs rdiff -u -r1.71 -r1.71.28.1 src/sys/compat/svr4/svr4_fcntl.c
cvs rdiff -u -r1.23 -r1.23.38.1 src/sys/compat/svr4/svr4_filio.c
cvs rdiff -u -r1.36 -r1.36.38.1 src/sys/compat/svr4/svr4_ioctl.c
cvs rdiff -u -r1.26 -r1.26.62.1 src/sys/compat/svr4/svr4_ipc.c
cvs rdiff -u -r1.7 -r1.7.62.1 src/sys/compat/svr4/svr4_schedctl.c
cvs rdiff -u -r1.65 -r1.65.30.1 src/sys/compat/svr4/svr4_signal.c
cvs rdiff -u -r1.35 -r1.35.62.1 src/sys/compat/svr4/svr4_sockio.c
cvs rdiff -u -r1.27 -r1.27.62.1 src/sys/compat/svr4/svr4_termios.c
cvs rdiff -u -r1.33 -r1.33.62.1 src/sys/compat/svr4/svr4_ttold.c
cvs rdiff -u -r1.33 -r1.33.2.1 src/sys/fs/cd9660/cd9660_node.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/fs/cd9660/cd9660_util.c
cvs rdiff -u -r1.2 -r1.2.40.1 src/sys/fs/puffs/puffs_compat.c
cvs rdiff -u -r1.94.4.1 -r1.94.4.2 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.31.4.4 -r1.31.4.5 src/sys/fs/puffs/puffs_node.c
cvs rdiff -u -r1.66 -r1.66.42.1 src/sys/fs/puffs/puffs_subr.c
cvs rdiff -u -r1.113.2.1 -r1.113.2.2 src/sys/fs/puffs/puffs_vfsops.c
cvs rdiff -u -r1.3 -r1.3.40.1 src/sys/fs/udf/udf_strat_bootstrap.c
cvs rdiff -u -r1.408.2.1 -r1.408.2.2 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/miscfs/fdesc/fdesc_vfsops.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/miscfs/genfs/layer_vfsops.c
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/miscfs/nullfs/null_vfsops.c
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/miscfs/overlay/overlay_vfsops.c
cvs rdiff -u -r1.20 -r1.20.4.1 src/sys/miscfs/overlay/overlay_vnops.c
cvs rdiff -u -r1.105 -r1.105.2.1 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.92 -r1.92.2.1 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.28 -r1.28.38.1 src/sys/miscfs/umapfs/umap_subr.c
cvs rdiff -u -r1.93.2.1 -r1.93.2.2 src/sys/miscfs/umapfs/umap_vfsops.c
cvs rdiff -u -r1.56 -r1.56.4.1 src/sys/miscfs/umapfs/umap_vnops.c
cvs rdiff -u -r1.33 -r1.33.12.1 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.151.2.1 -r1.151.2.2 src/sys/netinet/in_pcb.c
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.176.2.2 -r1.176.2.3 src/sys/netinet/tcp_output.c
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/netinet/tcp_sack.c
cvs rdiff -u -r1.255 -r1.255.4.1 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.87 -r1.87.4.1 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.200 -r1.200.2.1 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/netinet/tcp_vtw.c
cvs rdiff -u -r1.17 -r1.17.66.1 src/sys/netinet6/dest6.c
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.128.2.1 -r1.128.2.2 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.73 -r1.73.2.1 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.44 -r1.44.12.1 src/sys/netinet6/udp6_output.c
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/sys/malloc.h
cvs rdiff -u -r1.12 -r1.12.14.1 src/sys/sys/mallocvar.h
cvs rdiff -u -r1.11.2.1 -r1.11.2.2 src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.64.8.1 -r1.64.8.2 src/sys/ufs/ext2fs/ext2fs_readwrite.c
cvs rdiff -u -r1.183.2.1 -r1.183.2.2 src/sys/ufs/ext2fs/ext2fs_vfsops.c
cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/ufs/ext2fs/ext2fs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1906.2.2 src/distrib/sets/lists/comp/mi:1.1906.2.3
--- src/distrib/sets/lists/comp/mi:1.1906.2.2 Thu Nov 27 11:36:25 2014
+++ src/distrib/sets/lists/comp/mi Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1906.2.2 2014/11/27 11:36:25 martin Exp $
+# $NetBSD: mi,v 1.1906.2.3 2015/01/17 12:10:54 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9676,7 +9676,7 @@
./usr/share/man/cat9/MALLOC.0 comp-sys-catman .cat
./usr/share/man/cat9/MALLOC_DECLARE.0 comp-sys-catman .cat
./usr/share/man/cat9/MALLOC_DEFINE.0 comp-sys-catman .cat
-./usr/share/man/cat9/MALLOC_DEFINE_LIMIT.0 comp-sys-catman .cat
+./usr/share/man/cat9/MALLOC_DEFINE_LIMIT.0 comp-obsolete obsolete
./usr/share/man/cat9/MCHTYPE.0 comp-sys-catman .cat
./usr/share/man/cat9/MCLGET.0 comp-sys-catman .cat
./usr/share/man/cat9/MEXTADD.0 comp-sys-catman .cat
@@ -10445,10 +10445,10 @@
./usr/share/man/cat9/m_tag_unlink.0 comp-sys-catman .cat
./usr/share/man/cat9/makeiplcookie.0 comp-sys-catman .cat
./usr/share/man/cat9/malloc.0 comp-sys-catman .cat
-./usr/share/man/cat9/malloc_roundup.0 comp-sys-catman .cat
+./usr/share/man/cat9/malloc_roundup.0 comp-obsolete obsolete
./usr/share/man/cat9/malloc_type_attach.0 comp-sys-catman .cat
./usr/share/man/cat9/malloc_type_detach.0 comp-sys-catman .cat
-./usr/share/man/cat9/malloc_type_setlimit.0 comp-sys-catman .cat
+./usr/share/man/cat9/malloc_type_setlimit.0 comp-obsolete obsolete
./usr/share/man/cat9/mb.0 comp-sys-catman .cat
./usr/share/man/cat9/mb_memory.0 comp-sys-catman .cat
./usr/share/man/cat9/mb_read.0 comp-sys-catman .cat
@@ -16442,7 +16442,7 @@
./usr/share/man/html9/MALLOC.html comp-sys-htmlman html
./usr/share/man/html9/MALLOC_DECLARE.html comp-sys-htmlman html
./usr/share/man/html9/MALLOC_DEFINE.html comp-sys-htmlman html
-./usr/share/man/html9/MALLOC_DEFINE_LIMIT.html comp-sys-htmlman html
+./usr/share/man/html9/MALLOC_DEFINE_LIMIT.html comp-obsolete obsolete
./usr/share/man/html9/MCHTYPE.html comp-sys-htmlman html
./usr/share/man/html9/MCLGET.html comp-sys-htmlman html
./usr/share/man/html9/MEXTADD.html comp-sys-htmlman html
@@ -17174,10 +17174,10 @@
./usr/share/man/html9/m_tag_unlink.html comp-sys-htmlman html
./usr/share/man/html9/makeiplcookie.html comp-sys-htmlman html
./usr/share/man/html9/malloc.html comp-sys-htmlman html
-./usr/share/man/html9/malloc_roundup.html comp-sys-htmlman html
+./usr/share/man/html9/malloc_roundup.html comp-obsolete obsolete
./usr/share/man/html9/malloc_type_attach.html comp-sys-htmlman html
./usr/share/man/html9/malloc_type_detach.html comp-sys-htmlman html
-./usr/share/man/html9/malloc_type_setlimit.html comp-sys-htmlman html
+./usr/share/man/html9/malloc_type_setlimit.html comp-obsolete obsolete
./usr/share/man/html9/mb.html comp-sys-htmlman html
./usr/share/man/html9/mb_memory.html comp-sys-htmlman html
./usr/share/man/html9/mb_read.html comp-sys-htmlman html
@@ -23293,7 +23293,7 @@
./usr/share/man/man9/MALLOC.9 comp-sys-man .man
./usr/share/man/man9/MALLOC_DECLARE.9 comp-sys-man .man
./usr/share/man/man9/MALLOC_DEFINE.9 comp-sys-man .man
-./usr/share/man/man9/MALLOC_DEFINE_LIMIT.9 comp-sys-man .man
+./usr/share/man/man9/MALLOC_DEFINE_LIMIT.9 comp-obsolete obsolete
./usr/share/man/man9/MCHTYPE.9 comp-sys-man .man
./usr/share/man/man9/MCLGET.9 comp-sys-man .man
./usr/share/man/man9/MEXTADD.9 comp-sys-man .man
@@ -24062,10 +24062,10 @@
./usr/share/man/man9/m_tag_unlink.9 comp-sys-man .man
./usr/share/man/man9/makeiplcookie.9 comp-sys-man .man
./usr/share/man/man9/malloc.9 comp-sys-man .man
-./usr/share/man/man9/malloc_roundup.9 comp-sys-man .man
+./usr/share/man/man9/malloc_roundup.9 comp-obsolete obsolete
./usr/share/man/man9/malloc_type_attach.9 comp-sys-man .man
./usr/share/man/man9/malloc_type_detach.9 comp-sys-man .man
-./usr/share/man/man9/malloc_type_setlimit.9 comp-sys-man .man
+./usr/share/man/man9/malloc_type_setlimit.9 comp-obsolete obsolete
./usr/share/man/man9/mb.9 comp-sys-man .man
./usr/share/man/man9/mb_memory.9 comp-sys-man .man
./usr/share/man/man9/mb_read.9 comp-sys-man .man
Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.378 src/share/man/man9/Makefile:1.378.2.1
--- src/share/man/man9/Makefile:1.378 Sun May 25 15:34:20 2014
+++ src/share/man/man9/Makefile Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.378 2014/05/25 15:34:20 rmind Exp $
+# $NetBSD: Makefile,v 1.378.2.1 2015/01/17 12:10:55 martin Exp $
# Makefile for section 9 (kernel function and variable) manual pages.
@@ -452,9 +452,9 @@ MLINKS+=lock.9 simple_lock_init.9 lock.9
lock.9 spinlockinit.9 lock.9 spinlockmgr.9
MLINKS+=ltsleep.9 wakeup.9 ltsleep.9 mtsleep.9 ltsleep.9 tsleep.9
MLINKS+=malloc.9 MALLOC.9 malloc.9 realloc.9 malloc.9 free.9 malloc.9 FREE.9
-MLINKS+=malloc.9 malloc_roundup.9 malloc.9 malloc_type_attach.9
-MLINKS+=malloc.9 malloc_type_detach.9 malloc.9 malloc_type_setlimit.9
-MLINKS+=malloc.9 MALLOC_DEFINE_LIMIT.9 malloc.9 MALLOC_DEFINE.9
+MLINKS+=malloc.9 malloc_type_attach.9
+MLINKS+=malloc.9 malloc_type_detach.9
+MLINKS+=malloc.9 MALLOC_DEFINE.9
MLINKS+=malloc.9 MALLOC_DECLARE.9
MLINKS+=mb.9 mb_memory.9 mb.9 mb_read.9 mb.9 mb_write.9
MLINKS+=mbuf.9 m_get.9 mbuf.9 m_getclr.9 mbuf.9 m_gethdr.9 mbuf.9 m_devget.9 \
Index: src/share/man/man9/malloc.9
diff -u src/share/man/man9/malloc.9:1.49 src/share/man/man9/malloc.9:1.49.2.1
--- src/share/man/man9/malloc.9:1.49 Tue May 27 17:12:22 2014
+++ src/share/man/man9/malloc.9 Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: malloc.9,v 1.49 2014/05/27 17:12:22 wiz Exp $
+.\" $NetBSD: malloc.9,v 1.49.2.1 2015/01/17 12:10:55 martin Exp $
.\"
.\" Copyright (c) 1996, 2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 27, 2014
+.Dd December 27, 2014
.Dt MALLOC 9
.Os
.Sh NAME
@@ -36,11 +36,8 @@
.Nm realloc ,
.Nm free ,
.Nm FREE ,
-.Nm malloc_roundup ,
.Nm malloc_type_attach ,
.Nm malloc_type_detach ,
-.Nm malloc_type_setlimit ,
-.Nm MALLOC_DEFINE_LIMIT ,
.Nm MALLOC_DEFINE ,
.Nm MALLOC_DECLARE
.Nd general-purpose kernel memory allocator
@@ -53,17 +50,11 @@
"int flags"
.Ft void
.Fn free "void *addr" "struct malloc_type *type"
-.Ft unsigned long
-.Fn malloc_roundup "unsigned long size"
.Ft void
.Fn malloc_type_attach "struct malloc_type *type"
.Ft void
.Fn malloc_type_detach "struct malloc_type *type"
-.Ft void
-.Fn malloc_type_setlimit "struct malloc_type *type" "unsigned long limit"
.In sys/mallocvar.h
-.Fn MALLOC_DEFINE_LIMIT "type" "shortdesc" "longdesc" "limit"
-.Fn MALLOC_JUSTDEFINE_LIMIT "type" "shortdesc" "longdesc" "limit"
.Fn MALLOC_DEFINE "type" "shortdesc" "longdesc"
.Fn MALLOC_JUSTDEFINE "type" "shortdesc" "longdesc"
.Fn MALLOC_DECLARE "type"
@@ -82,8 +73,6 @@ The
function allocates uninitialized memory in kernel address space for an
object whose size is specified by
.Fa size .
-.Fn malloc_roundup
-returns the actual size of the allocation unit for the given value.
.Fn free
releases memory at address
.Fa addr
@@ -195,7 +184,7 @@ In addition to some built-in generic typ
memory allocator, subsystems may define their own types.
.Pp
The
-.Fn MALLOC_DEFINE_LIMIT
+.Fn MALLOC_DEFINE
macro defines a malloc type named
.Fa type
with the short description
@@ -207,20 +196,9 @@ The
argument, also a constant string, is intended as way to place a
comment in the actual type definition, and is not currently stored
in the type structure.
-The
-.Fa limit
-argument specifies the maximum amount of memory, in bytes, that this
-malloc type can consume.
-.Pp
-The
-.Fn MALLOC_DEFINE
-macro is equivalent to the
-.Fn MALLOC_DEFINE_LIMIT
-macro with a
-.Fa limit
-argument of 0.
-If kernel memory statistics are being gathered, the system will
-choose a reasonable default limit for the malloc type.
+If kernel memory statistics are being
+gathered, the system will choose a reasonable default limit for
+the malloc type.
.Pp
The
.Fn MALLOC_DECLARE
@@ -252,15 +230,6 @@ function detaches the malloc type
previously attached with
.Fn malloc_type_attach .
.Pp
-The
-.Fn malloc_type_setlimit
-function sets the memory limit of the malloc type
-.Fa type
-to
-.Fa limit
-bytes.
-The type must already be registered with the kernel memory allocator.
-.Pp
The following generic malloc types are currently defined:
.Pp
.Bl -tag -offset indent -width XXXXXXXXXXXXXX -compact
Index: src/sys/compat/common/compat_util.c
diff -u src/sys/compat/common/compat_util.c:1.45 src/sys/compat/common/compat_util.c:1.45.4.1
--- src/sys/compat/common/compat_util.c:1.45 Tue Dec 17 20:45:22 2013
+++ src/sys/compat/common/compat_util.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_util.c,v 1.45 2013/12/17 20:45:22 martin Exp $ */
+/* $NetBSD: compat_util.c,v 1.45.4.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.45 2013/12/17 20:45:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_util.c,v 1.45.4.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: compat_util.
#include <sys/exec.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/mount.h>
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.7 src/sys/compat/common/if_43.c:1.7.2.1
--- src/sys/compat/common/if_43.c:1.7 Tue Jul 1 05:49:18 2014
+++ src/sys/compat/common/if_43.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.7 2014/07/01 05:49:18 rtr Exp $ */
+/* $NetBSD: if_43.c,v 1.7.2.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.7 2014/07/01 05:49:18 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.7.2.1 2015/01/17 12:10:54 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -49,7 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/unistd.h>
#include <sys/resourcevar.h>
Index: src/sys/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.27 src/sys/compat/common/kern_time_50.c:1.27.4.1
--- src/sys/compat/common/kern_time_50.c:1.27 Fri Apr 4 18:17:36 2014
+++ src/sys/compat/common/kern_time_50.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.27 2014/04/04 18:17:36 njoly Exp $ */
+/* $NetBSD: kern_time_50.c,v 1.27.4.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.27 2014/04/04 18:17:36 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.27.4.1 2015/01/17 12:10:54 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_time_50
#include <sys/proc.h>
#include <sys/uio.h>
#include <sys/dirent.h>
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <sys/time.h>
#include <sys/timex.h>
Index: src/sys/compat/common/uipc_syscalls_43.c
diff -u src/sys/compat/common/uipc_syscalls_43.c:1.44 src/sys/compat/common/uipc_syscalls_43.c:1.44.42.1
--- src/sys/compat/common/uipc_syscalls_43.c:1.44 Fri Nov 14 23:10:57 2008
+++ src/sys/compat/common/uipc_syscalls_43.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls_43.c,v 1.44 2008/11/14 23:10:57 ad Exp $ */
+/* $NetBSD: uipc_syscalls_43.c,v 1.44.42.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.44 2008/11/14 23:10:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.44.42.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/fcntl.h>
-#include <sys/malloc.h>
#include <sys/syslog.h>
#include <sys/unistd.h>
#include <sys/resourcevar.h>
Index: src/sys/compat/freebsd/freebsd_exec_elf32.c
diff -u src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19 src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19.2.1
--- src/sys/compat/freebsd/freebsd_exec_elf32.c:1.19 Tue Jun 24 12:17:40 2014
+++ src/sys/compat/freebsd/freebsd_exec_elf32.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $ */
+/* $NetBSD: freebsd_exec_elf32.c,v 1.19.2.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -31,12 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_exec_elf32.c,v 1.19 2014/06/24 12:17:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_exec_elf32.c,v 1.19.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/exec.h>
#ifndef ELFSIZE
Index: src/sys/compat/freebsd/freebsd_file.c
diff -u src/sys/compat/freebsd/freebsd_file.c:1.32 src/sys/compat/freebsd/freebsd_file.c:1.32.36.1
--- src/sys/compat/freebsd/freebsd_file.c:1.32 Tue Mar 2 21:14:43 2010
+++ src/sys/compat/freebsd/freebsd_file.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_file.c,v 1.32 2010/03/02 21:14:43 pooka Exp $ */
+/* $NetBSD: freebsd_file.c,v 1.32.36.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1995 Frank van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_file.c,v 1.32 2010/03/02 21:14:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_file.c,v 1.32.36.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_file
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/freebsd/freebsd_ipc.c
diff -u src/sys/compat/freebsd/freebsd_ipc.c:1.16 src/sys/compat/freebsd/freebsd_ipc.c:1.16.40.1
--- src/sys/compat/freebsd/freebsd_ipc.c:1.16 Sun Jan 11 02:45:47 2009
+++ src/sys/compat/freebsd/freebsd_ipc.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_ipc.c,v 1.16 2009/01/11 02:45:47 christos Exp $ */
+/* $NetBSD: freebsd_ipc.c,v 1.16.40.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1994 Adam Glass and Charles M. Hannum. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.c,v 1.16 2009/01/11 02:45:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.c,v 1.16.40.1 2015/01/17 12:10:55 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_ipc.
#include <sys/proc.h>
#include <sys/sem.h>
#include <sys/shm.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/freebsd/freebsd_misc.c
diff -u src/sys/compat/freebsd/freebsd_misc.c:1.32 src/sys/compat/freebsd/freebsd_misc.c:1.32.72.1
--- src/sys/compat/freebsd/freebsd_misc.c:1.32 Thu Dec 20 23:02:47 2007
+++ src/sys/compat/freebsd/freebsd_misc.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_misc.c,v 1.32 2007/12/20 23:02:47 dsl Exp $ */
+/* $NetBSD: freebsd_misc.c,v 1.32.72.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1995 Frank van der Linden
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.32 2007/12/20 23:02:47 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_misc.c,v 1.32.72.1 2015/01/17 12:10:55 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ntp.h"
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_misc
#include <sys/mount.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/ktrace.h>
Index: src/sys/compat/linux/arch/alpha/linux_machdep.c
diff -u src/sys/compat/linux/arch/alpha/linux_machdep.c:1.49 src/sys/compat/linux/arch/alpha/linux_machdep.c:1.49.26.1
--- src/sys/compat/linux/arch/alpha/linux_machdep.c:1.49 Fri Nov 18 04:07:43 2011
+++ src/sys/compat/linux/arch/alpha/linux_machdep.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.49 2011/11/18 04:07:43 christos Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.49.26.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.49 2011/11/18 04:07:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.49.26.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <sys/exec.h>
#include <sys/file.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/alpha/linux_pipe.c
diff -u src/sys/compat/linux/arch/alpha/linux_pipe.c:1.16 src/sys/compat/linux/arch/alpha/linux_pipe.c:1.16.2.1
--- src/sys/compat/linux/arch/alpha/linux_pipe.c:1.16 Sun Jun 1 13:42:12 2014
+++ src/sys/compat/linux/arch/alpha/linux_pipe.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pipe.c,v 1.16 2014/06/01 13:42:12 njoly Exp $ */
+/* $NetBSD: linux_pipe.c,v 1.16.2.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.16 2014/06/01 13:42:12 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.16.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mman.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/arm/linux_machdep.c
diff -u src/sys/compat/linux/arch/arm/linux_machdep.c:1.31 src/sys/compat/linux/arch/arm/linux_machdep.c:1.31.4.1
--- src/sys/compat/linux/arch/arm/linux_machdep.c:1.31 Sun Aug 18 07:01:45 2013
+++ src/sys/compat/linux/arch/arm/linux_machdep.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.31 2013/08/18 07:01:45 matt Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.31.4.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.31 2013/08/18 07:01:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.31.4.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <sys/exec.h>
#include <sys/file.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/arm/linux_ptrace.c
diff -u src/sys/compat/linux/arch/arm/linux_ptrace.c:1.17 src/sys/compat/linux/arch/arm/linux_ptrace.c:1.17.14.1
--- src/sys/compat/linux/arch/arm/linux_ptrace.c:1.17 Tue Sep 4 00:08:59 2012
+++ src/sys/compat/linux/arch/arm/linux_ptrace.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.17 2012/09/04 00:08:59 matt Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.17.14.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,10 +31,9 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.17 2012/09/04 00:08:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.17.14.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
Index: src/sys/compat/linux/arch/i386/linux_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_machdep.c:1.158 src/sys/compat/linux/arch/i386/linux_machdep.c:1.158.4.1
--- src/sys/compat/linux/arch/i386/linux_machdep.c:1.158 Wed Feb 19 21:23:02 2014
+++ src/sys/compat/linux/arch/i386/linux_machdep.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.158 2014/02/19 21:23:02 dsl Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.158.4.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.158 2014/02/19 21:23:02 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.158.4.1 2015/01/17 12:10:53 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <sys/exec.h>
#include <sys/file.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/i386/linux_ptrace.c
diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28.2.1 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28.2.2
--- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.28.2.1 Thu Oct 30 11:51:18 2014
+++ src/sys/compat/linux/arch/i386/linux_ptrace.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.28.2.2 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.28.2.1 2014/10/30 11:51:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.28.2.2 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
Index: src/sys/compat/linux/arch/mips/linux_machdep.c
diff -u src/sys/compat/linux/arch/mips/linux_machdep.c:1.42 src/sys/compat/linux/arch/mips/linux_machdep.c:1.42.30.1
--- src/sys/compat/linux/arch/mips/linux_machdep.c:1.42 Sun Feb 20 08:14:10 2011
+++ src/sys/compat/linux/arch/mips/linux_machdep.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.42 2011/02/20 08:14:10 matt Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.42.30.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.42 2011/02/20 08:14:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.42.30.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <sys/exec.h>
#include <sys/file.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/mips/linux_ptrace.c
diff -u src/sys/compat/linux/arch/mips/linux_ptrace.c:1.9 src/sys/compat/linux/arch/mips/linux_ptrace.c:1.9.42.1
--- src/sys/compat/linux/arch/mips/linux_ptrace.c:1.9 Wed Nov 12 12:36:10 2008
+++ src/sys/compat/linux/arch/mips/linux_ptrace.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.9 2008/11/12 12:36:10 ad Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.9.42.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.9 2008/11/12 12:36:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.9.42.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
Index: src/sys/compat/linux/arch/powerpc/linux_machdep.c
diff -u src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.47 src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.47.12.1
--- src/sys/compat/linux/arch/powerpc/linux_machdep.c:1.47 Sun Jan 27 14:47:37 2013
+++ src/sys/compat/linux/arch/powerpc/linux_machdep.c Sat Jan 17 12:10:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.47 2013/01/27 14:47:37 mbalmer Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.47.12.1 2015/01/17 12:10:56 martin Exp $ */
/*-
* Copyright (c) 1995, 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.47 2013/01/27 14:47:37 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.47.12.1 2015/01/17 12:10:56 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <sys/exec.h>
#include <sys/file.h>
#include <sys/callout.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/msgbuf.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c
diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25.2.1 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25.2.2
--- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.25.2.1 Thu Oct 30 11:51:18 2014
+++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Sat Jan 17 12:10:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $ */
+/* $NetBSD: linux_ptrace.c,v 1.25.2.2 2015/01/17 12:10:56 martin Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -30,10 +30,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.25.2.1 2014/10/30 11:51:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.25.2.2 2015/01/17 12:10:56 martin Exp $");
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/ptrace.h>
Index: src/sys/compat/linux/common/linux_exec.c
diff -u src/sys/compat/linux/common/linux_exec.c:1.116 src/sys/compat/linux/common/linux_exec.c:1.116.14.1
--- src/sys/compat/linux/common/linux_exec.c:1.116 Sun Feb 19 21:06:37 2012
+++ src/sys/compat/linux/common/linux_exec.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec.c,v 1.116 2012/02/19 21:06:37 rmind Exp $ */
+/* $NetBSD: linux_exec.c,v 1.116.14.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,13 +31,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.116 2012/02/19 21:06:37 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.116.14.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/common/linux_exec_aout.c
diff -u src/sys/compat/linux/common/linux_exec_aout.c:1.66 src/sys/compat/linux/common/linux_exec_aout.c:1.66.38.1
--- src/sys/compat/linux/common/linux_exec_aout.c:1.66 Sat Aug 15 23:39:35 2009
+++ src/sys/compat/linux/common/linux_exec_aout.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec_aout.c,v 1.66 2009/08/15 23:39:35 matt Exp $ */
+/* $NetBSD: linux_exec_aout.c,v 1.66.38.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.66 2009/08/15 23:39:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec_aout.c,v 1.66.38.1 2015/01/17 12:10:54 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_a
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/common/linux_fadvise64.c
diff -u src/sys/compat/linux/common/linux_fadvise64.c:1.2 src/sys/compat/linux/common/linux_fadvise64.c:1.2.2.1
--- src/sys/compat/linux/common/linux_fadvise64.c:1.2 Sat May 17 09:23:51 2014
+++ src/sys/compat/linux/common/linux_fadvise64.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_fadvise64.c,v 1.2 2014/05/17 09:23:51 njoly Exp $ */
+/* $NetBSD: linux_fadvise64.c,v 1.2.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_fadvise64.c,v 1.2 2014/05/17 09:23:51 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_fadvise64.c,v 1.2.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_fadvis
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/tty.h>
Index: src/sys/compat/linux/common/linux_fadvise64_64.c
diff -u src/sys/compat/linux/common/linux_fadvise64_64.c:1.2 src/sys/compat/linux/common/linux_fadvise64_64.c:1.2.2.1
--- src/sys/compat/linux/common/linux_fadvise64_64.c:1.2 Tue May 6 18:17:22 2014
+++ src/sys/compat/linux/common/linux_fadvise64_64.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_fadvise64_64.c,v 1.2 2014/05/06 18:17:22 njoly Exp $ */
+/* $NetBSD: linux_fadvise64_64.c,v 1.2.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_fadvise64_64.c,v 1.2 2014/05/06 18:17:22 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_fadvise64_64.c,v 1.2.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_fadvis
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/tty.h>
Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.113 src/sys/compat/linux/common/linux_file.c:1.113.2.1
--- src/sys/compat/linux/common/linux_file.c:1.113 Wed Jun 25 16:38:53 2014
+++ src/sys/compat/linux/common/linux_file.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file.c,v 1.113 2014/06/25 16:38:53 njoly Exp $ */
+/* $NetBSD: linux_file.c,v 1.113.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.113 2014/06/25 16:38:53 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.113.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_file.c
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/tty.h>
Index: src/sys/compat/linux/common/linux_llseek.c
diff -u src/sys/compat/linux/common/linux_llseek.c:1.33 src/sys/compat/linux/common/linux_llseek.c:1.33.58.1
--- src/sys/compat/linux/common/linux_llseek.c:1.33 Wed Jun 18 12:24:17 2008
+++ src/sys/compat/linux/common/linux_llseek.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_llseek.c,v 1.33 2008/06/18 12:24:17 tsutsui Exp $ */
+/* $NetBSD: linux_llseek.c,v 1.33.58.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.33 2008/06/18 12:24:17 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_llseek.c,v 1.33.58.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/conf.h>
#include <sys/sched.h>
Index: src/sys/compat/linux/common/linux_misc_notalpha.c
diff -u src/sys/compat/linux/common/linux_misc_notalpha.c:1.108 src/sys/compat/linux/common/linux_misc_notalpha.c:1.108.34.1
--- src/sys/compat/linux/common/linux_misc_notalpha.c:1.108 Tue Nov 2 18:14:05 2010
+++ src/sys/compat/linux/common/linux_misc_notalpha.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc_notalpha.c,v 1.108 2010/11/02 18:14:05 chs Exp $ */
+/* $NetBSD: linux_misc_notalpha.c,v 1.108.34.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.108 2010/11/02 18:14:05 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc_notalpha.c,v 1.108.34.1 2015/01/17 12:10:54 martin Exp $");
/*
* Note that we must NOT include "opt_compat_linux32.h" here,
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_misc_n
#include <sys/kernel.h>
#include <sys/mman.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/namei.h>
#include <sys/proc.h>
Index: src/sys/compat/linux/common/linux_pipe.c
diff -u src/sys/compat/linux/common/linux_pipe.c:1.66 src/sys/compat/linux/common/linux_pipe.c:1.66.2.1
--- src/sys/compat/linux/common/linux_pipe.c:1.66 Sun Jun 1 13:42:12 2014
+++ src/sys/compat/linux/common/linux_pipe.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_pipe.c,v 1.66 2014/06/01 13:42:12 njoly Exp $ */
+/* $NetBSD: linux_pipe.c,v 1.66.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.66 2014/06/01 13:42:12 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_pipe.c,v 1.66.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/mman.h>
#include <sys/mount.h>
Index: src/sys/compat/linux/common/linux_sched.c
diff -u src/sys/compat/linux/common/linux_sched.c:1.66 src/sys/compat/linux/common/linux_sched.c:1.66.4.1
--- src/sys/compat/linux/common/linux_sched.c:1.66 Thu Jan 23 19:18:08 2014
+++ src/sys/compat/linux/common/linux_sched.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $ */
+/* $NetBSD: linux_sched.c,v 1.66.4.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,14 +35,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.66 2014/01/23 19:18:08 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.66.4.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/sysctl.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
#include <sys/wait.h>
#include <sys/kauth.h>
Index: src/sys/compat/linux/common/linux_signal.c
diff -u src/sys/compat/linux/common/linux_signal.c:1.75 src/sys/compat/linux/common/linux_signal.c:1.75.26.1
--- src/sys/compat/linux/common/linux_signal.c:1.75 Fri Nov 18 17:36:06 2011
+++ src/sys/compat/linux/common/linux_signal.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.75 2011/11/18 17:36:06 christos Exp $ */
+/* $NetBSD: linux_signal.c,v 1.75.26.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.75 2011/11/18 17:36:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.75.26.1 2015/01/17 12:10:54 martin Exp $");
#define COMPAT_LINUX 1
@@ -62,7 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_signal
#include <sys/kernel.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/malloc.h>
#include <sys/wait.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.119 src/sys/compat/linux/common/linux_socket.c:1.119.2.1
--- src/sys/compat/linux/common/linux_socket.c:1.119 Fri May 23 12:28:51 2014
+++ src/sys/compat/linux/common/linux_socket.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.119 2014/05/23 12:28:51 njoly Exp $ */
+/* $NetBSD: linux_socket.c,v 1.119.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.119 2014/05/23 12:28:51 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.119.2.1 2015/01/17 12:10:54 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_socket
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
Index: src/sys/compat/linux/common/linux_socketcall.c
diff -u src/sys/compat/linux/common/linux_socketcall.c:1.44 src/sys/compat/linux/common/linux_socketcall.c:1.44.2.1
--- src/sys/compat/linux/common/linux_socketcall.c:1.44 Sat Jun 21 10:23:07 2014
+++ src/sys/compat/linux/common/linux_socketcall.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socketcall.c,v 1.44 2014/06/21 10:23:07 maxv Exp $ */
+/* $NetBSD: linux_socketcall.c,v 1.44.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.44 2014/06/21 10:23:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socketcall.c,v 1.44.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
Index: src/sys/compat/linux/common/linux_uselib.c
diff -u src/sys/compat/linux/common/linux_uselib.c:1.30.38.1 src/sys/compat/linux/common/linux_uselib.c:1.30.38.2
--- src/sys/compat/linux/common/linux_uselib.c:1.30.38.1 Mon Dec 29 16:35:51 2014
+++ src/sys/compat/linux/common/linux_uselib.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_uselib.c,v 1.30.38.1 2014/12/29 16:35:51 martin Exp $ */
+/* $NetBSD: linux_uselib.c,v 1.30.38.2 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.30.38.1 2014/12/29 16:35:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.30.38.2 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/mount.h>
Index: src/sys/compat/linux32/common/linux32_misc.c
diff -u src/sys/compat/linux32/common/linux32_misc.c:1.23 src/sys/compat/linux32/common/linux32_misc.c:1.23.4.1
--- src/sys/compat/linux32/common/linux32_misc.c:1.23 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux32/common/linux32_misc.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_misc.c,v 1.23 2013/11/18 01:32:52 chs Exp $ */
+/* $NetBSD: linux32_misc.c,v 1.23.4.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,13 +32,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.23 2013/11/18 01:32:52 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.23.4.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <sys/malloc.h>
#include <sys/fstypes.h>
#include <sys/vfs_syscalls.h>
#include <sys/ptrace.h>
Index: src/sys/compat/svr4/svr4_exec_elf32.c
diff -u src/sys/compat/svr4/svr4_exec_elf32.c:1.14 src/sys/compat/svr4/svr4_exec_elf32.c:1.14.62.1
--- src/sys/compat/svr4/svr4_exec_elf32.c:1.14 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_exec_elf32.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_exec_elf32.c,v 1.14 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_exec_elf32.c,v 1.14.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf32.c,v 1.14 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf32.c,v 1.14.62.1 2015/01/17 12:10:53 martin Exp $");
#define ELFSIZE 32 /* XXX should die */
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_exec_el
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/exec_elf.h>
Index: src/sys/compat/svr4/svr4_exec_elf64.c
diff -u src/sys/compat/svr4/svr4_exec_elf64.c:1.14 src/sys/compat/svr4/svr4_exec_elf64.c:1.14.62.1
--- src/sys/compat/svr4/svr4_exec_elf64.c:1.14 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_exec_elf64.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_exec_elf64.c,v 1.14 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_exec_elf64.c,v 1.14.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf64.c,v 1.14 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_exec_elf64.c,v 1.14.62.1 2015/01/17 12:10:53 martin Exp $");
#define ELFSIZE 64 /* XXX should die */
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_exec_el
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
-#include <sys/malloc.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/exec_elf.h>
Index: src/sys/compat/svr4/svr4_fcntl.c
diff -u src/sys/compat/svr4/svr4_fcntl.c:1.71 src/sys/compat/svr4/svr4_fcntl.c:1.71.28.1
--- src/sys/compat/svr4/svr4_fcntl.c:1.71 Fri Oct 14 09:23:29 2011
+++ src/sys/compat/svr4/svr4_fcntl.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_fcntl.c,v 1.71 2011/10/14 09:23:29 hannken Exp $ */
+/* $NetBSD: svr4_fcntl.c,v 1.71.28.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 1997, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.71 2011/10/14 09:23:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c,v 1.71.28.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_fcntl.c
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/kauth.h>
Index: src/sys/compat/svr4/svr4_filio.c
diff -u src/sys/compat/svr4/svr4_filio.c:1.23 src/sys/compat/svr4/svr4_filio.c:1.23.38.1
--- src/sys/compat/svr4/svr4_filio.c:1.23 Sun May 24 21:41:25 2009
+++ src/sys/compat/svr4/svr4_filio.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_filio.c,v 1.23 2009/05/24 21:41:25 ad Exp $ */
+/* $NetBSD: svr4_filio.c,v 1.23.38.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.23 2009/05/24 21:41:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_filio.c,v 1.23.38.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_filio.c
#include <sys/socket.h>
#include <sys/mount.h>
#include <net/if.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_ioctl.c
diff -u src/sys/compat/svr4/svr4_ioctl.c:1.36 src/sys/compat/svr4/svr4_ioctl.c:1.36.38.1
--- src/sys/compat/svr4/svr4_ioctl.c:1.36 Sat Mar 14 21:04:18 2009
+++ src/sys/compat/svr4/svr4_ioctl.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_ioctl.c,v 1.36 2009/03/14 21:04:18 dsl Exp $ */
+/* $NetBSD: svr4_ioctl.c,v 1.36.38.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.36 2009/03/14 21:04:18 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c,v 1.36.38.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_ioctl.c
#include <sys/socket.h>
#include <sys/mount.h>
#include <net/if.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_ipc.c
diff -u src/sys/compat/svr4/svr4_ipc.c:1.26 src/sys/compat/svr4/svr4_ipc.c:1.26.62.1
--- src/sys/compat/svr4/svr4_ipc.c:1.26 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_ipc.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_ipc.c,v 1.26 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_ipc.c,v 1.26.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_ipc.c,v 1.26 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_ipc.c,v 1.26.62.1 2015/01/17 12:10:53 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -44,7 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_ipc.c,v
#include <sys/proc.h>
#include <sys/uio.h>
#include <sys/time.h>
-#include <sys/malloc.h>
#include <sys/mman.h>
#include <sys/systm.h>
#include <sys/stat.h>
Index: src/sys/compat/svr4/svr4_schedctl.c
diff -u src/sys/compat/svr4/svr4_schedctl.c:1.7 src/sys/compat/svr4/svr4_schedctl.c:1.7.62.1
--- src/sys/compat/svr4/svr4_schedctl.c:1.7 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_schedctl.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_schedctl.c,v 1.7 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_schedctl.c,v 1.7.62.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_schedctl.c,v 1.7 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_schedctl.c,v 1.7.62.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_schedct
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_signal.c
diff -u src/sys/compat/svr4/svr4_signal.c:1.65 src/sys/compat/svr4/svr4_signal.c:1.65.30.1
--- src/sys/compat/svr4/svr4_signal.c:1.65 Thu Feb 3 21:45:31 2011
+++ src/sys/compat/svr4/svr4_signal.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_signal.c,v 1.65 2011/02/03 21:45:31 joerg Exp $ */
+/* $NetBSD: svr4_signal.c,v 1.65.30.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.65 2011/02/03 21:45:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_signal.c,v 1.65.30.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_signal.
#include <sys/kernel.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/malloc.h>
#include <sys/wait.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_sockio.c
diff -u src/sys/compat/svr4/svr4_sockio.c:1.35 src/sys/compat/svr4/svr4_sockio.c:1.35.62.1
--- src/sys/compat/svr4/svr4_sockio.c:1.35 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_sockio.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_sockio.c,v 1.35 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_sockio.c,v 1.35.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1995, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.35 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_sockio.c,v 1.35.62.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_sockio.
#include <sys/socket.h>
#include <sys/mount.h>
#include <net/if.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_termios.c
diff -u src/sys/compat/svr4/svr4_termios.c:1.27 src/sys/compat/svr4/svr4_termios.c:1.27.62.1
--- src/sys/compat/svr4/svr4_termios.c:1.27 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_termios.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_termios.c,v 1.27 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_termios.c,v 1.27.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.27 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_termios.c,v 1.27.62.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_termios
#include <sys/socket.h>
#include <sys/mount.h>
#include <net/if.h>
-#include <sys/malloc.h>
#include <sys/syscallargs.h>
Index: src/sys/compat/svr4/svr4_ttold.c
diff -u src/sys/compat/svr4/svr4_ttold.c:1.33 src/sys/compat/svr4/svr4_ttold.c:1.33.62.1
--- src/sys/compat/svr4/svr4_ttold.c:1.33 Mon Apr 28 20:23:45 2008
+++ src/sys/compat/svr4/svr4_ttold.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_ttold.c,v 1.33 2008/04/28 20:23:45 martin Exp $ */
+/* $NetBSD: svr4_ttold.c,v 1.33.62.1 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.33 2008/04/28 20:23:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c,v 1.33.62.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -43,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: svr4_ttold.c
#include <sys/socket.h>
#include <sys/mount.h>
#include <net/if.h>
-#include <sys/malloc.h>
#include <sys/ioctl_compat.h>
#include <sys/syscallargs.h>
Index: src/sys/fs/cd9660/cd9660_node.c
diff -u src/sys/fs/cd9660/cd9660_node.c:1.33 src/sys/fs/cd9660/cd9660_node.c:1.33.2.1
--- src/sys/fs/cd9660/cd9660_node.c:1.33 Mon Jun 16 09:55:49 2014
+++ src/sys/fs/cd9660/cd9660_node.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_node.c,v 1.33 2014/06/16 09:55:49 hannken Exp $ */
+/* $NetBSD: cd9660_node.c,v 1.33.2.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.33 2014/06/16 09:55:49 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.33.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_node.
#include <sys/vnode.h>
#include <sys/namei.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/stat.h>
Index: src/sys/fs/cd9660/cd9660_util.c
diff -u src/sys/fs/cd9660/cd9660_util.c:1.11 src/sys/fs/cd9660/cd9660_util.c:1.11.2.1
--- src/sys/fs/cd9660/cd9660_util.c:1.11 Sun Jun 1 11:01:18 2014
+++ src/sys/fs/cd9660/cd9660_util.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_util.c,v 1.11 2014/06/01 11:01:18 martin Exp $ */
+/* $NetBSD: cd9660_util.c,v 1.11.2.1 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.11 2014/06/01 11:01:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.11.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_util.
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
#include <sys/dirent.h>
#include <fs/cd9660/iso.h>
Index: src/sys/fs/puffs/puffs_compat.c
diff -u src/sys/fs/puffs/puffs_compat.c:1.2 src/sys/fs/puffs/puffs_compat.c:1.2.40.1
--- src/sys/fs/puffs/puffs_compat.c:1.2 Sun Jul 11 11:17:27 2010
+++ src/sys/fs/puffs/puffs_compat.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_compat.c,v 1.2 2010/07/11 11:17:27 pooka Exp $ */
+/* $NetBSD: puffs_compat.c,v 1.2.40.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -32,14 +32,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.2 2010/07/11 11:17:27 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.2.40.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
#include <sys/kmem.h>
#include <sys/kthread.h>
#include <sys/lock.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/proc.h>
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.94.4.1 src/sys/fs/puffs/puffs_msgif.c:1.94.4.2
--- src/sys/fs/puffs/puffs_msgif.c:1.94.4.1 Fri Aug 29 11:55:34 2014
+++ src/sys/fs/puffs/puffs_msgif.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.94.4.1 2014/08/29 11:55:34 martin Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.94.4.2 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.94.4.1 2014/08/29 11:55:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.94.4.2 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: puffs_msgif.
#include <sys/kmem.h>
#include <sys/kthread.h>
#include <sys/lock.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/proc.h>
Index: src/sys/fs/puffs/puffs_node.c
diff -u src/sys/fs/puffs/puffs_node.c:1.31.4.4 src/sys/fs/puffs/puffs_node.c:1.31.4.5
--- src/sys/fs/puffs/puffs_node.c:1.31.4.4 Sun Nov 9 10:09:32 2014
+++ src/sys/fs/puffs/puffs_node.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_node.c,v 1.31.4.4 2014/11/09 10:09:32 msaitoh Exp $ */
+/* $NetBSD: puffs_node.c,v 1.31.4.5 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.31.4.4 2014/11/09 10:09:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_node.c,v 1.31.4.5 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/hash.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/vnode.h>
Index: src/sys/fs/puffs/puffs_subr.c
diff -u src/sys/fs/puffs/puffs_subr.c:1.66 src/sys/fs/puffs/puffs_subr.c:1.66.42.1
--- src/sys/fs/puffs/puffs_subr.c:1.66 Sun Nov 16 19:34:30 2008
+++ src/sys/fs/puffs/puffs_subr.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_subr.c,v 1.66 2008/11/16 19:34:30 pooka Exp $ */
+/* $NetBSD: puffs_subr.c,v 1.66.42.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -29,11 +29,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_subr.c,v 1.66 2008/11/16 19:34:30 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_subr.c,v 1.66.42.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/buf.h>
-#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/poll.h>
Index: src/sys/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.113.2.1 src/sys/fs/puffs/puffs_vfsops.c:1.113.2.2
--- src/sys/fs/puffs/puffs_vfsops.c:1.113.2.1 Fri Aug 29 11:55:34 2014
+++ src/sys/fs/puffs/puffs_vfsops.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vfsops.c,v 1.113.2.1 2014/08/29 11:55:34 martin Exp $ */
+/* $NetBSD: puffs_vfsops.c,v 1.113.2.2 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.113.2.1 2014/08/29 11:55:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vfsops.c,v 1.113.2.2 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/extattr.h>
#include <sys/queue.h>
#include <sys/vnode.h>
Index: src/sys/fs/udf/udf_strat_bootstrap.c
diff -u src/sys/fs/udf/udf_strat_bootstrap.c:1.3 src/sys/fs/udf/udf_strat_bootstrap.c:1.3.40.1
--- src/sys/fs/udf/udf_strat_bootstrap.c:1.3 Tue Dec 16 16:18:25 2008
+++ src/sys/fs/udf/udf_strat_bootstrap.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_bootstrap.c,v 1.3 2008/12/16 16:18:25 pooka Exp $ */
+/* $NetBSD: udf_strat_bootstrap.c,v 1.3.40.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_bootstrap.c,v 1.3 2008/12/16 16:18:25 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_bootstrap.c,v 1.3.40.1 2015/01/17 12:10:54 martin Exp $");
#endif /* not lint */
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: udf_strat_bo
#include <sys/device.h>
#include <sys/disklabel.h>
#include <sys/ioctl.h>
-#include <sys/malloc.h>
#include <sys/dirent.h>
#include <sys/stat.h>
#include <sys/conf.h>
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.408.2.1 src/sys/kern/kern_exec.c:1.408.2.2
--- src/sys/kern/kern_exec.c:1.408.2.1 Sat Oct 25 10:00:47 2014
+++ src/sys/kern/kern_exec.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $ */
+/* $NetBSD: kern_exec.c,v 1.408.2.2 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.1 2014/10/25 10:00:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.2 2015/01/17 12:10:55 martin Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -75,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exec.c,
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/mount.h>
-#include <sys/malloc.h>
#include <sys/kmem.h>
#include <sys/namei.h>
#include <sys/vnode.h>
Index: src/sys/miscfs/fdesc/fdesc_vfsops.c
diff -u src/sys/miscfs/fdesc/fdesc_vfsops.c:1.89 src/sys/miscfs/fdesc/fdesc_vfsops.c:1.89.2.1
--- src/sys/miscfs/fdesc/fdesc_vfsops.c:1.89 Sun Jul 13 11:23:01 2014
+++ src/sys/miscfs/fdesc/fdesc_vfsops.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vfsops.c,v 1.89 2014/07/13 11:23:01 hannken Exp $ */
+/* $NetBSD: fdesc_vfsops.c,v 1.89.2.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.89 2014/07/13 11:23:01 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops.c,v 1.89.2.1 2015/01/17 12:10:53 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -58,7 +58,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdesc_vfsops
#include <sys/mount.h>
#include <sys/dirent.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <sys/module.h>
Index: src/sys/miscfs/genfs/layer_subr.c
diff -u src/sys/miscfs/genfs/layer_subr.c:1.36 src/sys/miscfs/genfs/layer_subr.c:1.36.2.1
--- src/sys/miscfs/genfs/layer_subr.c:1.36 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/genfs/layer_subr.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_subr.c,v 1.36 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: layer_subr.c,v 1.36.2.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.36 2014/05/25 13:51:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_subr.c,v 1.36.2.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: layer_subr.c
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <miscfs/genfs/layer.h>
#include <miscfs/genfs/layer_extern.h>
Index: src/sys/miscfs/genfs/layer_vfsops.c
diff -u src/sys/miscfs/genfs/layer_vfsops.c:1.44 src/sys/miscfs/genfs/layer_vfsops.c:1.44.2.1
--- src/sys/miscfs/genfs/layer_vfsops.c:1.44 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/genfs/layer_vfsops.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vfsops.c,v 1.44 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: layer_vfsops.c,v 1.44.2.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.44 2014/05/25 13:51:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: layer_vfsops.c,v 1.44.2.1 2015/01/17 12:10:53 martin Exp $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: layer_vfsops
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <sys/module.h>
Index: src/sys/miscfs/nullfs/null_vfsops.c
diff -u src/sys/miscfs/nullfs/null_vfsops.c:1.89 src/sys/miscfs/nullfs/null_vfsops.c:1.89.2.1
--- src/sys/miscfs/nullfs/null_vfsops.c:1.89 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/nullfs/null_vfsops.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: null_vfsops.c,v 1.89 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: null_vfsops.c,v 1.89.2.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.89 2014/05/25 13:51:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.89.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: null_vfsops.
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/module.h>
#include <miscfs/nullfs/null.h>
Index: src/sys/miscfs/overlay/overlay_vfsops.c
diff -u src/sys/miscfs/overlay/overlay_vfsops.c:1.62 src/sys/miscfs/overlay/overlay_vfsops.c:1.62.2.1
--- src/sys/miscfs/overlay/overlay_vfsops.c:1.62 Sun May 25 13:51:25 2014
+++ src/sys/miscfs/overlay/overlay_vfsops.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: overlay_vfsops.c,v 1.62 2014/05/25 13:51:25 hannken Exp $ */
+/* $NetBSD: overlay_vfsops.c,v 1.62.2.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1999, 2000 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.62 2014/05/25 13:51:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.62.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,6 @@ __KERNEL_RCSID(0, "$NetBSD: overlay_vfso
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/module.h>
#include <miscfs/overlay/overlay.h>
#include <miscfs/genfs/layer_extern.h>
Index: src/sys/miscfs/overlay/overlay_vnops.c
diff -u src/sys/miscfs/overlay/overlay_vnops.c:1.20 src/sys/miscfs/overlay/overlay_vnops.c:1.20.4.1
--- src/sys/miscfs/overlay/overlay_vnops.c:1.20 Thu Feb 27 16:51:38 2014
+++ src/sys/miscfs/overlay/overlay_vnops.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: overlay_vnops.c,v 1.20 2014/02/27 16:51:38 hannken Exp $ */
+/* $NetBSD: overlay_vnops.c,v 1.20.4.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1999, 2000 National Aeronautics & Space Administration
@@ -67,7 +67,7 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: overlay_vnops.c,v 1.20 2014/02/27 16:51:38 hannken Exp $
+ * $Id: overlay_vnops.c,v 1.20.4.1 2015/01/17 12:10:55 martin Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*/
@@ -126,7 +126,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.20 2014/02/27 16:51:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: overlay_vnops.c,v 1.20.4.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -135,7 +135,6 @@ __KERNEL_RCSID(0, "$NetBSD: overlay_vnop
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/buf.h>
#include <miscfs/genfs/genfs.h>
#include <miscfs/overlay/overlay.h>
Index: src/sys/miscfs/procfs/procfs_subr.c
diff -u src/sys/miscfs/procfs/procfs_subr.c:1.105 src/sys/miscfs/procfs/procfs_subr.c:1.105.2.1
--- src/sys/miscfs/procfs/procfs_subr.c:1.105 Sun Jul 27 16:47:26 2014
+++ src/sys/miscfs/procfs/procfs_subr.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_subr.c,v 1.105 2014/07/27 16:47:26 hannken Exp $ */
+/* $NetBSD: procfs_subr.c,v 1.105.2.1 2015/01/17 12:10:54 martin Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.105 2014/07/27 16:47:26 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.105.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,6 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_subr.
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/filedesc.h>
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.92 src/sys/miscfs/procfs/procfs_vfsops.c:1.92.2.1
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.92 Sun Jul 27 16:47:26 2014
+++ src/sys/miscfs/procfs/procfs_vfsops.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.92.2.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.92 2014/07/27 16:47:26 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.92.2.1 2015/01/17 12:10:54 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -94,7 +94,6 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_vfsop
#include <sys/dirent.h>
#include <sys/signalvar.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/kauth.h>
Index: src/sys/miscfs/umapfs/umap_subr.c
diff -u src/sys/miscfs/umapfs/umap_subr.c:1.28 src/sys/miscfs/umapfs/umap_subr.c:1.28.38.1
--- src/sys/miscfs/umapfs/umap_subr.c:1.28 Sun Mar 15 17:22:38 2009
+++ src/sys/miscfs/umapfs/umap_subr.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_subr.c,v 1.28 2009/03/15 17:22:38 cegger Exp $ */
+/* $NetBSD: umap_subr.c,v 1.28.38.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.28 2009/03/15 17:22:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_subr.c,v 1.28.38.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,7 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: umap_subr.c,
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <miscfs/specfs/specdev.h>
Index: src/sys/miscfs/umapfs/umap_vfsops.c
diff -u src/sys/miscfs/umapfs/umap_vfsops.c:1.93.2.1 src/sys/miscfs/umapfs/umap_vfsops.c:1.93.2.2
--- src/sys/miscfs/umapfs/umap_vfsops.c:1.93.2.1 Thu Aug 21 09:05:45 2014
+++ src/sys/miscfs/umapfs/umap_vfsops.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vfsops.c,v 1.93.2.1 2014/08/21 09:05:45 martin Exp $ */
+/* $NetBSD: umap_vfsops.c,v 1.93.2.2 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.93.2.1 2014/08/21 09:05:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.93.2.2 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: umap_vfsops.
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <sys/module.h>
Index: src/sys/miscfs/umapfs/umap_vnops.c
diff -u src/sys/miscfs/umapfs/umap_vnops.c:1.56 src/sys/miscfs/umapfs/umap_vnops.c:1.56.4.1
--- src/sys/miscfs/umapfs/umap_vnops.c:1.56 Thu Feb 27 16:51:38 2014
+++ src/sys/miscfs/umapfs/umap_vnops.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vnops.c,v 1.56 2014/02/27 16:51:38 hannken Exp $ */
+/* $NetBSD: umap_vnops.c,v 1.56.4.1 2015/01/17 12:10:54 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.56 2014/02/27 16:51:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vnops.c,v 1.56.4.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: umap_vnops.c
#include <sys/vnode.h>
#include <sys/mount.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/buf.h>
#include <sys/kauth.h>
Index: src/sys/netinet/if_atm.c
diff -u src/sys/netinet/if_atm.c:1.33 src/sys/netinet/if_atm.c:1.33.12.1
--- src/sys/netinet/if_atm.c:1.33 Mon Sep 24 03:05:53 2012
+++ src/sys/netinet/if_atm.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $ */
+/* $NetBSD: if_atm.c,v 1.33.12.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.33 2012/09/24 03:05:53 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1.33.12.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_natm.h"
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_atm.c,v 1
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/time.h>
Index: src/sys/netinet/in_pcb.c
diff -u src/sys/netinet/in_pcb.c:1.151.2.1 src/sys/netinet/in_pcb.c:1.151.2.2
--- src/sys/netinet/in_pcb.c:1.151.2.1 Mon Sep 8 19:12:04 2014
+++ src/sys/netinet/in_pcb.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_pcb.c,v 1.151.2.1 2014/09/08 19:12:04 msaitoh Exp $ */
+/* $NetBSD: in_pcb.c,v 1.151.2.2 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,14 +93,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.151.2.1 2014/09/08 19:12:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.151.2.2 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.145 src/sys/netinet/raw_ip.c:1.145.2.1
--- src/sys/netinet/raw_ip.c:1.145 Sat Aug 9 05:33:01 2014
+++ src/sys/netinet/raw_ip.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.145 2014/08/09 05:33:01 rtr Exp $ */
+/* $NetBSD: raw_ip.c,v 1.145.2.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.145 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.145.2.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1
#include <sys/param.h>
#include <sys/sysctl.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/protosw.h>
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.176.2.2 src/sys/netinet/tcp_output.c:1.176.2.3
--- src/sys/netinet/tcp_output.c:1.176.2.2 Sun Oct 26 09:48:18 2014
+++ src/sys/netinet/tcp_output.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.176.2.2 2014/10/26 09:48:18 martin Exp $ */
+/* $NetBSD: tcp_output.c,v 1.176.2.3 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.176.2.2 2014/10/26 09:48:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.176.2.3 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -143,7 +143,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_output.c
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_sack.c
diff -u src/sys/netinet/tcp_sack.c:1.29 src/sys/netinet/tcp_sack.c:1.29.4.1
--- src/sys/netinet/tcp_sack.c:1.29 Tue Nov 12 09:02:05 2013
+++ src/sys/netinet/tcp_sack.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_sack.c,v 1.29 2013/11/12 09:02:05 kefren Exp $ */
+/* $NetBSD: tcp_sack.c,v 1.29.4.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.29 2013/11/12 09:02:05 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.29.4.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -112,7 +112,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.255 src/sys/netinet/tcp_subr.c:1.255.4.1
--- src/sys/netinet/tcp_subr.c:1.255 Sun Mar 16 05:20:30 2014
+++ src/sys/netinet/tcp_subr.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.255 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.255.4.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.255 2014/03/16 05:20:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.255.4.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -103,7 +103,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v
#include <sys/atomic.h>
#include <sys/proc.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/once.h>
#include <sys/socket.h>
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.87 src/sys/netinet/tcp_timer.c:1.87.4.1
--- src/sys/netinet/tcp_timer.c:1.87 Thu Jan 2 18:29:01 2014
+++ src/sys/netinet/tcp_timer.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.87 2014/01/02 18:29:01 pooka Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.87.4.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,14 +93,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.87 2014/01/02 18:29:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.87.4.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_tcp_debug.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.200 src/sys/netinet/tcp_usrreq.c:1.200.2.1
--- src/sys/netinet/tcp_usrreq.c:1.200 Sat Aug 9 05:33:01 2014
+++ src/sys/netinet/tcp_usrreq.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.200 2014/08/09 05:33:01 rtr Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.200.2.1 2015/01/17 12:10:53 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.200 2014/08/09 05:33:01 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.200.2.1 2015/01/17 12:10:53 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -109,7 +109,6 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
Index: src/sys/netinet/tcp_vtw.c
diff -u src/sys/netinet/tcp_vtw.c:1.10 src/sys/netinet/tcp_vtw.c:1.10.4.1
--- src/sys/netinet/tcp_vtw.c:1.10 Sun Sep 15 14:47:40 2013
+++ src/sys/netinet/tcp_vtw.c Sat Jan 17 12:10:53 2015
@@ -84,7 +84,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/kmem.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
@@ -124,7 +123,7 @@
#include <netinet/tcp_vtw.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.10 2013/09/15 14:47:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_vtw.c,v 1.10.4.1 2015/01/17 12:10:53 martin Exp $");
#define db_trace(__a, __b) do { } while (/*CONSTCOND*/0)
Index: src/sys/netinet6/dest6.c
diff -u src/sys/netinet6/dest6.c:1.17 src/sys/netinet6/dest6.c:1.17.66.1
--- src/sys/netinet6/dest6.c:1.17 Tue Apr 15 03:57:04 2008
+++ src/sys/netinet6/dest6.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dest6.c,v 1.17 2008/04/15 03:57:04 thorpej Exp $ */
+/* $NetBSD: dest6.c,v 1.17.66.1 2015/01/17 12:10:54 martin Exp $ */
/* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */
/*
@@ -31,11 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.17 2008/04/15 03:57:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dest6.c,v 1.17.66.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.91 src/sys/netinet6/in6_ifattach.c:1.91.2.1
--- src/sys/netinet6/in6_ifattach.c:1.91 Thu Jun 5 16:06:49 2014
+++ src/sys/netinet6/in6_ifattach.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.91 2014/06/05 16:06:49 roy Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.91.2.1 2015/01/17 12:10:54 martin Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,12 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.91 2014/06/05 16:06:49 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.91.2.1 2015/01/17 12:10:54 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kmem.h>
-#include <sys/malloc.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/kernel.h>
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.128.2.1 src/sys/netinet6/in6_pcb.c:1.128.2.2
--- src/sys/netinet6/in6_pcb.c:1.128.2.1 Mon Sep 8 19:12:04 2014
+++ src/sys/netinet6/in6_pcb.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.128.2.1 2014/09/08 19:12:04 msaitoh Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,14 +62,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.1 2014/09/08 19:12:04 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.128.2.2 2015/01/17 12:10:54 martin Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/netinet6/ip6_forward.c
diff -u src/sys/netinet6/ip6_forward.c:1.73 src/sys/netinet6/ip6_forward.c:1.73.2.1
--- src/sys/netinet6/ip6_forward.c:1.73 Fri May 30 01:39:03 2014
+++ src/sys/netinet6/ip6_forward.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_forward.c,v 1.73 2014/05/30 01:39:03 christos Exp $ */
+/* $NetBSD: ip6_forward.c,v 1.73.2.1 2015/01/17 12:10:54 martin Exp $ */
/* $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $ */
/*
@@ -31,14 +31,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.73 2014/05/30 01:39:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.73.2.1 2015/01/17 12:10:54 martin Exp $");
#include "opt_gateway.h"
#include "opt_ipsec.h"
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/domain.h>
#include <sys/protosw.h>
Index: src/sys/netinet6/udp6_output.c
diff -u src/sys/netinet6/udp6_output.c:1.44 src/sys/netinet6/udp6_output.c:1.44.12.1
--- src/sys/netinet6/udp6_output.c:1.44 Sun Jan 6 00:17:13 2013
+++ src/sys/netinet6/udp6_output.c Sat Jan 17 12:10:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_output.c,v 1.44 2013/01/06 00:17:13 christos Exp $ */
+/* $NetBSD: udp6_output.c,v 1.44.12.1 2015/01/17 12:10:54 martin Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
/*
@@ -62,12 +62,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.44 2013/01/06 00:17:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.44.12.1 2015/01/17 12:10:54 martin Exp $");
#include "opt_inet.h"
#include <sys/param.h>
-#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
Index: src/sys/sys/malloc.h
diff -u src/sys/sys/malloc.h:1.115 src/sys/sys/malloc.h:1.115.2.1
--- src/sys/sys/malloc.h:1.115 Mon May 19 02:51:25 2014
+++ src/sys/sys/malloc.h Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.h,v 1.115 2014/05/19 02:51:25 rmind Exp $ */
+/* $NetBSD: malloc.h,v 1.115.2.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -74,18 +74,4 @@ void kern_free(void *);
#endif /* _KERNEL */
-/*
- * Set of buckets for each size of memory block that is retained
- */
-struct kmembuckets {
- void *kb_next; /* list of free blocks */
- void *kb_last; /* last free block */
- long kb_calls; /* total calls to allocate this size */
- long kb_total; /* total number of blocks allocated */
- long kb_totalfree; /* # of free elements in this bucket */
- long kb_elmpercl; /* # of elements in this sized allocation */
- long kb_highwat; /* high water mark */
- long kb_couldfree; /* over high water mark and could free */
-};
-
#endif /* !_SYS_MALLOC_H_ */
Index: src/sys/sys/mallocvar.h
diff -u src/sys/sys/mallocvar.h:1.12 src/sys/sys/mallocvar.h:1.12.14.1
--- src/sys/sys/mallocvar.h:1.12 Sun Apr 29 20:27:32 2012
+++ src/sys/sys/mallocvar.h Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mallocvar.h,v 1.12 2012/04/29 20:27:32 dsl Exp $ */
+/* $NetBSD: mallocvar.h,v 1.12.14.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -43,17 +43,8 @@
struct malloc_type;
#ifdef _KERNEL
-#define MALLOC_JUSTDEFINE_LIMIT(type, shortdesc, longdesc, limit)
-
-#define MALLOC_JUSTDEFINE(type, shortdesc, longdesc) \
- MALLOC_JUSTDEFINE_LIMIT(type, shortdesc, longdesc, 0)
-
-#define MALLOC_DEFINE_LIMIT(type, shortdesc, longdesc, limit) \
- MALLOC_JUSTDEFINE_LIMIT(type, shortdesc, longdesc, limit)
-
-#define MALLOC_DEFINE(type, shortdesc, longdesc) \
- MALLOC_DEFINE_LIMIT(type, shortdesc, longdesc, 0)
-
+#define MALLOC_JUSTDEFINE(type, shortdesc, longdesc)
+#define MALLOC_DEFINE(type, shortdesc, longdesc)
#define MALLOC_DECLARE(type) \
static struct malloc_type *const __unused type = 0
Index: src/sys/ufs/chfs/chfs_vfsops.c
diff -u src/sys/ufs/chfs/chfs_vfsops.c:1.11.2.1 src/sys/ufs/chfs/chfs_vfsops.c:1.11.2.2
--- src/sys/ufs/chfs/chfs_vfsops.c:1.11.2.1 Mon Dec 29 16:35:51 2014
+++ src/sys/ufs/chfs/chfs_vfsops.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vfsops.c,v 1.11.2.1 2014/12/29 16:35:51 martin Exp $ */
+/* $NetBSD: chfs_vfsops.c,v 1.11.2.2 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -43,7 +43,6 @@
#include <sys/proc.h>
#include <sys/module.h>
#include <sys/namei.h>
-#include <sys/malloc.h>
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/buf.h>
Index: src/sys/ufs/chfs/chfs_vnode.c
diff -u src/sys/ufs/chfs/chfs_vnode.c:1.10.4.1 src/sys/ufs/chfs/chfs_vnode.c:1.10.4.2
--- src/sys/ufs/chfs/chfs_vnode.c:1.10.4.1 Mon Sep 8 18:57:58 2014
+++ src/sys/ufs/chfs/chfs_vnode.c Sat Jan 17 12:10:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnode.c,v 1.10.4.1 2014/09/08 18:57:58 msaitoh Exp $ */
+/* $NetBSD: chfs_vnode.c,v 1.10.4.2 2015/01/17 12:10:53 martin Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,6 @@
#include "chfs.h"
#include "chfs_inode.h"
-#include <sys/malloc.h>
#include <sys/kauth.h>
#include <sys/namei.h>
#include <sys/uio.h>
Index: src/sys/ufs/ext2fs/ext2fs_readwrite.c
diff -u src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.64.8.1 src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.64.8.2
--- src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.64.8.1 Mon Oct 20 09:55:54 2014
+++ src/sys/ufs/ext2fs/ext2fs_readwrite.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_readwrite.c,v 1.64.8.1 2014/10/20 09:55:54 martin Exp $ */
+/* $NetBSD: ext2fs_readwrite.c,v 1.64.8.2 2015/01/17 12:10:55 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.64.8.1 2014/10/20 09:55:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.64.8.2 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_readw
#include <sys/proc.h>
#include <sys/mount.h>
#include <sys/vnode.h>
-#include <sys/malloc.h>
#include <sys/signalvar.h>
#include <sys/kauth.h>
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183.2.1 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183.2.2
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.183.2.1 Fri Aug 22 19:20:15 2014
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.183.2.1 2014/08/22 19:20:15 martin Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.183.2.2 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.183.2.1 2014/08/22 19:20:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.183.2.2 2015/01/17 12:10:55 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -82,7 +82,6 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsop
#include <sys/disklabel.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
-#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/lock.h>
#include <sys/conf.h>
Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.113 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.113.2.1
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.113 Fri Jul 25 08:20:53 2014
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c Sat Jan 17 12:10:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vnops.c,v 1.113 2014/07/25 08:20:53 dholland Exp $ */
+/* $NetBSD: ext2fs_vnops.c,v 1.113.2.1 2015/01/17 12:10:55 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.113 2014/07/25 08:20:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.113.2.1 2015/01/17 12:10:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,6 @@ __KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/lockf.h>
-#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/signalvar.h>
#include <sys/kauth.h>
