bring mrg-vm-swap2 onto mainilne.

This commit is contained in:
mrg 1997-06-12 15:46:19 +00:00
parent 277b52f964
commit 552af779d2
22 changed files with 33 additions and 228 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.59 1997/05/31 22:38:59 cjs Exp $
# $NetBSD: Makefile.inc,v 1.60 1997/06/12 15:46:58 mrg Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/17/93
# sys sources
@ -43,7 +43,7 @@ ASM= accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \
setpriority.o setregid.o setreuid.o \
setrlimit.o setsid.o setsockopt.o settimeofday.o \
setuid.o shmat.o shmctl.o shmdt.o shmget.o shutdown.o sigaction.o \
sigaltstack.o socket.o socketpair.o stat.o statfs.o swapon.o \
sigaltstack.o socket.o socketpair.o stat.o statfs.o swapctl.o \
symlink.o sysarch.o umask.o undelete.o unlink.o unmount.o \
utimes.o vadvise.o wait4.o write.o writev.o __semctl.o __syscall.o \
__sysctl.o
@ -166,7 +166,7 @@ MAN+= accept.2 access.2 acct.2 adjtime.2 bind.2 brk.2 chdir.2 chflags.2 \
shmat.2 shmctl.2 shmget.2 \
shutdown.2 sigaction.2 sigaltstack.2 sigpending.2 \
sigprocmask.2 sigreturn.2 sigstack.2 sigsuspend.2 socket.2 \
socketpair.2 stat.2 statfs.2 swapon.2 symlink.2 sync.2 sysarch.2 \
socketpair.2 stat.2 statfs.2 swapctl.2 symlink.2 sync.2 sysarch.2 \
syscall.2 truncate.2 umask.2 unlink.2 utimes.2 vfork.2 wait.2 write.2
MLINKS+=brk.2 sbrk.2

View File

@ -1,4 +1,4 @@
.\" $NetBSD: swapon.2,v 1.7 1995/02/27 12:38:21 cgd Exp $
.\" $NetBSD: swapctl.2,v 1.1 1997/06/12 15:46:59 mrg Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@ -31,78 +31,20 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" @(#)swapon.2 8.1 (Berkeley) 6/4/93
.\" from: @(#)swapon.2 8.1 (Berkeley) 6/4/93
.\"
.Dd June 4, 1993
.Dd June 12, 1997
.Dt SWAPON 2
.Os BSD 4
.Os NetBSD
.Sh NAME
.Nm swapon
.Nd add a swap device for interleaved paging/swapping
.Nm swapctl
.Nd modify swap configuration
.Sh SYNOPSIS
.Fd #include <unistd.h>
.Ft int
.Fn swapon "const char *special"
.Sh DESCRIPTION
.Fn Swapon
makes the block device
.Fa special
available to the system for
allocation for paging and swapping. The names of potentially
available devices are known to the system and defined at system
configuration time. The size of the swap area on
.Fa special
is calculated at the time the device is first made available
for swapping.
.Sh RETURN VALUES
If an error has occurred, a value of -1 is returned and
.Va errno
is set to indicate the error.
.Sh ERRORS
.Fn Swapon
succeeds unless:
.Bl -tag -width Er
.It Bq Er ENOTDIR
A component of the path prefix is not a directory.
.It Bq Er ENAMETOOLONG
A component of a pathname exceeded
.Dv {NAME_MAX}
characters, or an entire path name exceeded
.Dv {PATH_MAX}
characters.
.It Bq Er ENOENT
The named device does not exist.
.It Bq Er EACCES
Search permission is denied for a component of the path prefix.
.It Bq Er ELOOP
Too many symbolic links were encountered in translating the pathname.
.It Bq Er EPERM
The caller is not the super-user.
.It Bq Er ENOTBLK
.Fa Special
is not a block device.
.It Bq Er EBUSY
The device specified by
.Fa special
has already
been made available for swapping
.It Bq Er EINVAL
The device configured by
.Fa special
was not
configured into the system as a swap device.
.It Bq Er ENXIO
The major device number of
.Fa special
is out of range (this indicates no device driver exists
for the associated hardware).
.It Bq Er EIO
An I/O error occurred while opening the swap device.
.It Bq Er EFAULT
.Fa Special
points outside the process's allocated address space.
.Fn swapctl "int cmd" "const void *arg" "int misc"
.Sh SEE ALSO
.Xr swapon 8 ,
.Xr swapctl 8 ,
.Xr config 8
.Sh BUGS
There is no way to stop swapping on a disk so that the pack may be
@ -111,6 +53,6 @@ dismounted.
This call will be upgraded in future versions of the system.
.Sh HISTORY
The
.Fn swapon
.Fn swapctl
function call appeared in
.Bx 4.0 .
.Nx 1.3 .

View File

@ -1,116 +0,0 @@
.\" $NetBSD: swapon.3,v 1.7 1995/02/27 12:38:21 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
.\" 1. Redistributions of source code must retain the above copyright
.\" notice, this list of conditions and the following disclaimer.
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\" 3. All advertising materials mentioning features or use of this software
.\" must display the following acknowledgement:
.\" This product includes software developed by the University of
.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" @(#)swapon.2 8.1 (Berkeley) 6/4/93
.\"
.Dd June 4, 1993
.Dt SWAPON 2
.Os BSD 4
.Sh NAME
.Nm swapon
.Nd add a swap device for interleaved paging/swapping
.Sh SYNOPSIS
.Fd #include <unistd.h>
.Ft int
.Fn swapon "const char *special"
.Sh DESCRIPTION
.Fn Swapon
makes the block device
.Fa special
available to the system for
allocation for paging and swapping. The names of potentially
available devices are known to the system and defined at system
configuration time. The size of the swap area on
.Fa special
is calculated at the time the device is first made available
for swapping.
.Sh RETURN VALUES
If an error has occurred, a value of -1 is returned and
.Va errno
is set to indicate the error.
.Sh ERRORS
.Fn Swapon
succeeds unless:
.Bl -tag -width Er
.It Bq Er ENOTDIR
A component of the path prefix is not a directory.
.It Bq Er ENAMETOOLONG
A component of a pathname exceeded
.Dv {NAME_MAX}
characters, or an entire path name exceeded
.Dv {PATH_MAX}
characters.
.It Bq Er ENOENT
The named device does not exist.
.It Bq Er EACCES
Search permission is denied for a component of the path prefix.
.It Bq Er ELOOP
Too many symbolic links were encountered in translating the pathname.
.It Bq Er EPERM
The caller is not the super-user.
.It Bq Er ENOTBLK
.Fa Special
is not a block device.
.It Bq Er EBUSY
The device specified by
.Fa special
has already
been made available for swapping
.It Bq Er EINVAL
The device configured by
.Fa special
was not
configured into the system as a swap device.
.It Bq Er ENXIO
The major device number of
.Fa special
is out of range (this indicates no device driver exists
for the associated hardware).
.It Bq Er EIO
An I/O error occurred while opening the swap device.
.It Bq Er EFAULT
.Fa Special
points outside the process's allocated address space.
.Sh SEE ALSO
.Xr swapon 8 ,
.Xr config 8
.Sh BUGS
There is no way to stop swapping on a disk so that the pack may be
dismounted.
.Pp
This call will be upgraded in future versions of the system.
.Sh HISTORY
The
.Fn swapon
function call appeared in
.Bx 4.0 .

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.79 1997/06/08 23:59:57 veego Exp $ */
/* $NetBSD: machdep.c,v 1.80 1997/06/12 15:46:19 mrg Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -30,7 +30,7 @@
#include <machine/options.h> /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.79 1997/06/08 23:59:57 veego Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.80 1997/06/12 15:46:19 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -458,7 +458,6 @@ unknown_cputype:
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.91 1997/06/08 23:54:19 veego Exp $ */
/* $NetBSD: machdep.c,v 1.92 1997/06/12 15:46:23 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -290,7 +290,6 @@ again:
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
/* valloc(cfree, struct cblock, nclist); */
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.22 1997/06/08 23:59:59 veego Exp $ */
/* $NetBSD: machdep.c,v 1.23 1997/06/12 15:46:26 mrg Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -2357,7 +2357,6 @@ allocsys(v)
v = (caddr_t)((name) + (num));
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.48 1997/06/10 18:43:46 veego Exp $ */
/* $NetBSD: machdep.c,v 1.49 1997/06/12 15:46:28 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -219,7 +219,6 @@ again:
(name) = (type *)v; v = (caddr_t)((lim) = ((name)+(num)))
/* valloc(cfree, struct cblock, nclist); */
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.93 1997/06/10 18:49:35 veego Exp $ */
/* $NetBSD: machdep.c,v 1.94 1997/06/12 15:46:29 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -392,7 +392,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.232 1997/06/06 23:29:25 veego Exp $ */
/* $NetBSD: machdep.c,v 1.233 1997/06/12 15:46:32 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -405,7 +405,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.148 1997/06/10 19:03:38 veego Exp $ */
/* $NetBSD: machdep.c,v 1.149 1997/06/12 15:46:34 mrg Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe. All rights reserved.
@ -344,7 +344,6 @@ again:
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.20 1997/06/08 23:54:28 veego Exp $ */
/* $NetBSD: machdep.c,v 1.21 1997/06/12 15:46:37 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -466,7 +466,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.9 1997/06/09 00:00:02 veego Exp $ */
/* $NetBSD: machdep.c,v 1.10 1997/06/12 15:46:44 mrg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -468,7 +468,6 @@ allocsys(v)
v = (caddr_t)(((name) = (type *)v) + (num))
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.65 1997/06/09 00:00:01 veego Exp $ */
/* $NetBSD: machdep.c,v 1.66 1997/06/12 15:46:39 mrg Exp $ */
/*-
* Copyright (c) 1996 Matthias Pfaller.
@ -330,7 +330,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.11 1997/06/08 23:54:29 veego Exp $ */
/* $NetBSD: machdep.c,v 1.12 1997/06/12 15:46:40 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -445,7 +445,6 @@ mips_init(argc, argv, code)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.77 1997/06/08 23:54:31 veego Exp $ */
/* $NetBSD: machdep.c,v 1.78 1997/06/12 15:46:42 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -755,7 +755,6 @@ mach_init(argc, argv, code, cv)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.9 1997/06/09 00:00:02 veego Exp $ */
/* $NetBSD: machdep.c,v 1.10 1997/06/12 15:46:44 mrg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -468,7 +468,6 @@ allocsys(v)
v = (caddr_t)(((name) = (type *)v) + (num))
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.80 1997/05/24 20:13:48 pk Exp $ */
/* $NetBSD: machdep.c,v 1.81 1997/06/12 15:46:46 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -311,9 +311,6 @@ allocsys(v)
#define valloc(name, type, num) \
v = (caddr_t)(((name) = (type *)v) + (num))
valloc(callout, struct callout, ncallout);
#if 1/*OLDSWAP*/
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#endif
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.93 1997/06/08 23:54:33 veego Exp $ */
/* $NetBSD: machdep.c,v 1.94 1997/06/12 15:46:48 mrg Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -184,7 +184,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.17 1997/06/08 23:54:35 veego Exp $ */
/* $NetBSD: machdep.c,v 1.18 1997/06/12 15:46:50 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -187,7 +187,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.17 1997/06/08 23:54:35 veego Exp $ */
/* $NetBSD: machdep.c,v 1.18 1997/06/12 15:46:50 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -187,7 +187,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.43 1997/06/09 00:00:07 veego Exp $ */
/* $NetBSD: machdep.c,v 1.44 1997/06/12 15:46:52 mrg Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@ -294,7 +294,6 @@ allocsys(v)
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.12 1997/06/08 23:54:36 veego Exp $ */
/* $NetBSD: machdep.c,v 1.13 1997/06/12 15:46:54 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -242,7 +242,6 @@ again:
valloc(cfree, struct cblock, nclist);
#endif
valloc(callout, struct callout, ncallout);
valloc(swapmap, struct map, nswapmap = maxproc * 2);
#ifdef SYSVSHM
valloc(shmsegs, struct shmid_ds, shminfo.shmmni);
#endif