[src/trunk]: src/sys/compat include compat/sys/cpuio.h and multiple include p...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b0d3a733183a
branches:  trunk
changeset: 831256:b0d3a733183a
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 18 04:10:39 2018 +0000

description:
include compat/sys/cpuio.h and multiple include protection.

diffstat:

 sys/compat/common/kern_cpu_60.c |  6 ++++--
 sys/compat/sys/cpuio.h          |  7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 3312c0e512d9 -r b0d3a733183a sys/compat/common/kern_cpu_60.c
--- a/sys/compat/common/kern_cpu_60.c   Sun Mar 18 02:16:21 2018 +0000
+++ b/sys/compat/common/kern_cpu_60.c   Sun Mar 18 04:10:39 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_cpu_60.c,v 1.2 2018/03/18 00:51:45 christos Exp $ */
+/*     $NetBSD: kern_cpu_60.c,v 1.3 2018/03/18 04:10:39 christos Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.2 2018/03/18 00:51:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.3 2018/03/18 04:10:39 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_cpu_ucode.h"
@@ -45,6 +45,8 @@
 #include <sys/cpu.h>
 #include <sys/cpuio.h>
 
+#include <compat/sys/cpuio.h>
+
 static int
 compat6_cpuctl_ioctl(struct lwp *l, u_long cmd, void *data)
 {
diff -r 3312c0e512d9 -r b0d3a733183a sys/compat/sys/cpuio.h
--- a/sys/compat/sys/cpuio.h    Sun Mar 18 02:16:21 2018 +0000
+++ b/sys/compat/sys/cpuio.h    Sun Mar 18 04:10:39 2018 +0000
@@ -1,4 +1,7 @@
-/* $NetBSD: cpuio.h,v 1.7 2018/03/18 00:51:45 christos Exp $ */
+/* $NetBSD: cpuio.h,v 1.8 2018/03/18 04:10:39 christos Exp $ */
+
+#ifndef _SYS_COMPAT_CPUIO_H_
+#define _SYS_COMPAT_CPUIO_H_
 
 #include <sys/ioccom.h>
 
@@ -14,3 +17,5 @@
 
 void kern_cpu_60_init(void);
 void kern_cpu_60_fini(void);
+
+#endif /* _SYS_COMPAT_CPUIO_H_ */