Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by maxv in ticke...
details: https://anonhg.NetBSD.org/src/rev/a188abbc57b3
branches: netbsd-7
changeset: 798852:a188abbc57b3
user: martin <martin%NetBSD.org@localhost>
date: Sat Jan 17 12:10:53 2015 +0000
description:
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.
diffstat:
distrib/sets/lists/comp/mi | 20 ++++++------
share/man/man9/Makefile | 8 ++--
share/man/man9/malloc.9 | 43 +++-----------------------
sys/compat/common/compat_util.c | 5 +-
sys/compat/common/if_43.c | 5 +-
sys/compat/common/kern_time_50.c | 5 +-
sys/compat/common/uipc_syscalls_43.c | 5 +-
sys/compat/freebsd/freebsd_exec_elf32.c | 5 +-
sys/compat/freebsd/freebsd_file.c | 5 +-
sys/compat/freebsd/freebsd_ipc.c | 5 +-
sys/compat/freebsd/freebsd_misc.c | 5 +-
sys/compat/linux/arch/alpha/linux_machdep.c | 5 +-
sys/compat/linux/arch/alpha/linux_pipe.c | 5 +-
sys/compat/linux/arch/arm/linux_machdep.c | 5 +-
sys/compat/linux/arch/arm/linux_ptrace.c | 5 +-
sys/compat/linux/arch/i386/linux_machdep.c | 5 +-
sys/compat/linux/arch/i386/linux_ptrace.c | 5 +-
sys/compat/linux/arch/mips/linux_machdep.c | 5 +-
sys/compat/linux/arch/mips/linux_ptrace.c | 5 +-
sys/compat/linux/arch/powerpc/linux_machdep.c | 5 +-
sys/compat/linux/arch/powerpc/linux_ptrace.c | 5 +-
sys/compat/linux/common/linux_exec.c | 5 +-
sys/compat/linux/common/linux_exec_aout.c | 5 +-
sys/compat/linux/common/linux_fadvise64.c | 5 +-
sys/compat/linux/common/linux_fadvise64_64.c | 5 +-
sys/compat/linux/common/linux_file.c | 5 +-
sys/compat/linux/common/linux_llseek.c | 5 +-
sys/compat/linux/common/linux_misc_notalpha.c | 5 +-
sys/compat/linux/common/linux_pipe.c | 5 +-
sys/compat/linux/common/linux_sched.c | 5 +-
sys/compat/linux/common/linux_signal.c | 5 +-
sys/compat/linux/common/linux_socket.c | 5 +-
sys/compat/linux/common/linux_socketcall.c | 5 +-
sys/compat/linux/common/linux_uselib.c | 5 +-
sys/compat/linux32/common/linux32_misc.c | 5 +-
sys/compat/svr4/svr4_exec_elf32.c | 5 +-
sys/compat/svr4/svr4_exec_elf64.c | 5 +-
sys/compat/svr4/svr4_fcntl.c | 5 +-
sys/compat/svr4/svr4_filio.c | 5 +-
sys/compat/svr4/svr4_ioctl.c | 5 +-
sys/compat/svr4/svr4_ipc.c | 5 +-
sys/compat/svr4/svr4_schedctl.c | 5 +-
sys/compat/svr4/svr4_signal.c | 5 +-
sys/compat/svr4/svr4_sockio.c | 5 +-
sys/compat/svr4/svr4_termios.c | 5 +-
sys/compat/svr4/svr4_ttold.c | 5 +-
sys/fs/cd9660/cd9660_node.c | 5 +-
sys/fs/cd9660/cd9660_util.c | 5 +-
sys/fs/puffs/puffs_compat.c | 5 +-
sys/fs/puffs/puffs_msgif.c | 5 +-
sys/fs/puffs/puffs_node.c | 5 +-
sys/fs/puffs/puffs_subr.c | 5 +-
sys/fs/puffs/puffs_vfsops.c | 5 +-
sys/fs/udf/udf_strat_bootstrap.c | 5 +-
sys/kern/kern_exec.c | 5 +-
sys/miscfs/fdesc/fdesc_vfsops.c | 5 +-
sys/miscfs/genfs/layer_subr.c | 5 +-
sys/miscfs/genfs/layer_vfsops.c | 5 +-
sys/miscfs/nullfs/null_vfsops.c | 5 +-
sys/miscfs/overlay/overlay_vfsops.c | 5 +-
sys/miscfs/overlay/overlay_vnops.c | 7 +--
sys/miscfs/procfs/procfs_subr.c | 5 +-
sys/miscfs/procfs/procfs_vfsops.c | 5 +-
sys/miscfs/umapfs/umap_subr.c | 5 +-
sys/miscfs/umapfs/umap_vfsops.c | 5 +-
sys/miscfs/umapfs/umap_vnops.c | 5 +-
sys/netinet/if_atm.c | 5 +-
sys/netinet/in_pcb.c | 5 +-
sys/netinet/raw_ip.c | 5 +-
sys/netinet/tcp_output.c | 5 +-
sys/netinet/tcp_sack.c | 5 +-
sys/netinet/tcp_subr.c | 5 +-
sys/netinet/tcp_timer.c | 5 +-
sys/netinet/tcp_usrreq.c | 5 +-
sys/netinet/tcp_vtw.c | 3 +-
sys/netinet6/dest6.c | 5 +-
sys/netinet6/in6_ifattach.c | 5 +-
sys/netinet6/in6_pcb.c | 5 +-
sys/netinet6/ip6_forward.c | 5 +-
sys/netinet6/udp6_output.c | 5 +-
sys/sys/malloc.h | 16 +---------
sys/sys/mallocvar.h | 15 +-------
sys/ufs/chfs/chfs_vfsops.c | 3 +-
sys/ufs/chfs/chfs_vnode.c | 3 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 5 +-
sys/ufs/ext2fs/ext2fs_vfsops.c | 5 +-
sys/ufs/ext2fs/ext2fs_vnops.c | 5 +-
87 files changed, 186 insertions(+), 322 deletions(-)
diffs (truncated from 2312 to 300 lines):
diff -r edaf925ff67e -r a188abbc57b3 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Sat Jan 17 12:01:37 2015 +0000
+++ b/distrib/sets/lists/comp/mi Sat Jan 17 12:10:53 2015 +0000
@@ -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
diff -r edaf925ff67e -r a188abbc57b3 share/man/man9/Makefile
--- a/share/man/man9/Makefile Sat Jan 17 12:01:37 2015 +0000
+++ b/share/man/man9/Makefile Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
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 \
diff -r edaf925ff67e -r a188abbc57b3 share/man/man9/malloc.9
--- a/share/man/man9/malloc.9 Sat Jan 17 12:01:37 2015 +0000
+++ b/share/man/man9/malloc.9 Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
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 @@
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 @@
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 @@
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
diff -r edaf925ff67e -r a188abbc57b3 sys/compat/common/compat_util.c
--- a/sys/compat/common/compat_util.c Sat Jan 17 12:01:37 2015 +0000
+++ b/sys/compat/common/compat_util.c Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
#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>
diff -r edaf925ff67e -r a188abbc57b3 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Sat Jan 17 12:01:37 2015 +0000
+++ b/sys/compat/common/if_43.c Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
#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>
diff -r edaf925ff67e -r a188abbc57b3 sys/compat/common/kern_time_50.c
--- a/sys/compat/common/kern_time_50.c Sat Jan 17 12:01:37 2015 +0000
+++ b/sys/compat/common/kern_time_50.c Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
#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>
diff -r edaf925ff67e -r a188abbc57b3 sys/compat/common/uipc_syscalls_43.c
--- a/sys/compat/common/uipc_syscalls_43.c Sat Jan 17 12:01:37 2015 +0000
+++ b/sys/compat/common/uipc_syscalls_43.c Sat Jan 17 12:10:53 2015 +0000
@@ -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 @@
Home |
Main Index |
Thread Index |
Old Index