CVS commit: [pgoyette-compat] src/sys/compat/sys

2018-03-17 Thread Paul Goyette 
Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 17 23:54:33 UTC 2018

Modified Files:
src/sys/compat/sys [pgoyette-compat]: cpuio.h

Log Message:
Add copyright, protect against double-inclusion


To generate a diff of this commit:
cvs rdiff -u -r1.5.16.1 -r1.5.16.2 src/sys/compat/sys/cpuio.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.5.16.1 src/sys/compat/sys/cpuio.h:1.5.16.2
--- src/sys/compat/sys/cpuio.h:1.5.16.1	Sat Mar 17 21:37:52 2018
+++ src/sys/compat/sys/cpuio.h	Sat Mar 17 23:54:33 2018
@@ -1,4 +1,36 @@
-/* $NetBSD: cpuio.h,v 1.5.16.1 2018/03/17 21:37:52 pgoyette Exp $ */
+/* $NetBSD: cpuio.h,v 1.5.16.2 2018/03/17 23:54:33 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifndef _COMPAT_SYS_CPUIO_H
+#define _COMPAT_SYS_CPUIO_H
 
 #include 
 
@@ -12,5 +44,4 @@ extern int (*compat_cpuctl_ioctl)(u_long
 #define OIOC_CPU_UCODE_GET_VERSION  _IOR('c', 4, struct compat6_cpu_ucode)
 #define OIOC_CPU_UCODE_APPLY_IOW('c', 5, struct compat6_cpu_ucode)
 
-void kern_cpu_60_init(void);
-void kern_cpu_60_fini(void);
+#endif /* _COMPAT_SYS_CPUIO_H */

CVS commit: [pgoyette-compat] src/sys/compat/sys

2018-03-07 Thread Paul Goyette 
Module Name:src
Committed By:   pgoyette
Date:   Thu Mar  8 01:37:47 UTC 2018

Modified Files:
src/sys/compat/sys [pgoyette-compat]: sockio.h

Log Message:
Declare the if_50_{init,fini} entry points


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.58.1 src/sys/compat/sys/sockio.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/compat/sys/sockio.h
diff -u src/sys/compat/sys/sockio.h:1.10 src/sys/compat/sys/sockio.h:1.10.58.1
--- src/sys/compat/sys/sockio.h:1.10	Sun Nov 14 15:36:47 2010
+++ src/sys/compat/sys/sockio.h	Thu Mar  8 01:37:46 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sockio.h,v 1.10 2010/11/14 15:36:47 uebayasi Exp $	*/
+/*	$NetBSD: sockio.h,v 1.10.58.1 2018/03/08 01:37:46 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -179,6 +179,9 @@ struct oifdatareq {
 		(oi)->ifi_lastchange.tv_usec * 1000; \
 	} while (/*CONSTCOND*/0)
 #ifdef _KERNEL
+void if_50_init(void);
+void if_50_fini(void);
+
 __BEGIN_DECLS
 int compat_ifconf(u_long, void *);
 int compat_ifdatareq(struct lwp *, u_long, void *);