BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / luna68k / luna68k / swapgeneric.c

diff --git a/usr/src/sys/luna68k/luna68k/swapgeneric.c b/usr/src/sys/luna68k/luna68k/swapgeneric.c
index cd5d475..0e572c4 100644 (file)
--- a/usr/src/sys/luna68k/luna68k/swapgeneric.c
+++ b/usr/src/sys/luna68k/luna68k/swapgeneric.c
@@ -1,13 +1,39 @@
 /*
  * Copyright (c) 1992 OMRON Corporation.
 /*
  * Copyright (c) 1992 OMRON Corporation.

- * Copyright (c) 1982, 1986, 1992 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- * from: hp300/hp300/swapgeneric.c     7.8 (Berkeley) 10/11/92
+ * 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.

  *
  *

- *     @(#)swapgeneric.c       8.1 (Berkeley) %G%
+ * from: hp300/hp300/swapgeneric.c     7.9 (Berkeley) 6/16/93
+ *
+ *     @(#)swapgeneric.c       8.2 (Berkeley) 12/6/93

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -30,7 +56,7 @@ int   nswap;
 
 struct swdevt swdevt[] = {
        { -1,   1,      0 },
 
 struct swdevt swdevt[] = {
        { -1,   1,      0 },

-       { 0,    0,      0 },
+       { NODEV,0,      0 },

 };
 
 int    dmmin, dmmax, dmtext;
 };
 
 int    dmmin, dmmax, dmtext;