Module Name: src
Committed By: christos
Date: Sun Mar 18 04:10:39 UTC 2018
Modified Files:
src/sys/compat/common: kern_cpu_60.c
src/sys/compat/sys: cpuio.h
Log Message:
include compat/sys/cpuio.h and multiple include protection.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/compat/common/kern_cpu_60.c
cvs rdiff -u -r1.7 -r1.8 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/common/kern_cpu_60.c
diff -u src/sys/compat/common/kern_cpu_60.c:1.2 src/sys/compat/common/kern_cpu_60.c:1.3
--- src/sys/compat/common/kern_cpu_60.c:1.2 Sat Mar 17 20:51:45 2018
+++ src/sys/compat/common/kern_cpu_60.c Sun Mar 18 00:10:39 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.
#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)
{
Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.7 src/sys/compat/sys/cpuio.h:1.8
--- src/sys/compat/sys/cpuio.h:1.7 Sat Mar 17 20:51:45 2018
+++ src/sys/compat/sys/cpuio.h Sun Mar 18 00:10:39 2018
@@ -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 @@ extern int (*compat_cpuctl_ioctl)(struct
void kern_cpu_60_init(void);
void kern_cpu_60_fini(void);
+
+#endif /* _SYS_COMPAT_CPUIO_H_ */
