added my responsibility for the `cpm' port

[unix-history] / sys / kern / subr_prf.c

diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index d691092..7dca9cb 100644 (file)
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) UNIX System Laboratories, Inc.  All or some portions
+ * of this file are derived from material licensed to the
+ * University of California by American Telephone and Telegraph Co.
+ * or UNIX System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ */

 /*-
  * Copyright (c) 1986, 1988, 1991 The Regents of the University of California.
  * All rights reserved.
 /*-
  * Copyright (c) 1986, 1988, 1991 The Regents of the University of California.
  * All rights reserved.


@@ -31,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)subr_prf.c    7.30 (Berkeley) 6/29/91
  * SUCH DAMAGE.
  *
  *     from: @(#)subr_prf.c    7.30 (Berkeley) 6/29/91

- *     $Id: subr_prf.c,v 1.5 1993/11/13 02:25:32 davidg Exp $
+ *     $Id: subr_prf.c,v 1.7 1994/02/27 15:07:20 phk Exp $

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -80,7 +87,6 @@ static void  logpri __P((int level));
 static void  putchar __P((int ch, int flags, struct tty *tp));
 static char *ksprintn __P((u_long num, int base, int *len));
 void  kprintf __P((const char *fmt, int flags, struct tty *tp, va_list));
 static void  putchar __P((int ch, int flags, struct tty *tp));
 static char *ksprintn __P((u_long num, int base, int *len));
 void  kprintf __P((const char *fmt, int flags, struct tty *tp, va_list));

-volatile void boot(int bootopt);

 
 /*
  * Variable panicstr contains argument to first call to panic; used
 
 /*
  * Variable panicstr contains argument to first call to panic; used


@@ -99,14 +105,8 @@ int msgbufmapped;
  * and then reboots.  If we are called twice, then we avoid trying to sync
  * the disks as this often leads to recursive panics.
  */
  * and then reboots.  If we are called twice, then we avoid trying to sync
  * the disks as this often leads to recursive panics.
  */

-#ifdef __STDC__
-volatile void
-panic(const char *msg)
-#else

 void
 void

-panic(msg)
-       char *msg;
-#endif
+panic(const char *msg)

 {
        int bootopt = RB_AUTOBOOT | RB_DUMP;
 
 {
        int bootopt = RB_AUTOBOOT | RB_DUMP;