Module Name: src
Committed By: ad
Date: Sat Dec 21 11:35:25 UTC 2019
Modified Files:
src/sys/kern: kern_cpu.c subr_cpu.c
Log Message:
Fix build failure.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/kern_cpu.c
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.88 src/sys/kern/kern_cpu.c:1.89
--- src/sys/kern/kern_cpu.c:1.88 Fri Dec 20 21:20:09 2019
+++ src/sys/kern/kern_cpu.c Sat Dec 21 11:35:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.88 2019/12/20 21:20:09 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.89 2019/12/21 11:35:25 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.88 2019/12/20 21:20:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.89 2019/12/21 11:35:25 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -101,6 +101,8 @@ CTASSERT(offsetof(struct cpu_info, ci_da
CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#endif
+int (*compat_cpuctl_ioctl)(struct lwp *, u_long, void *) = (void *)enosys;
+
static void cpu_xc_online(struct cpu_info *, void *);
static void cpu_xc_offline(struct cpu_info *, void *);
Index: src/sys/kern/subr_cpu.c
diff -u src/sys/kern/subr_cpu.c:1.1 src/sys/kern/subr_cpu.c:1.2
--- src/sys/kern/subr_cpu.c:1.1 Fri Dec 20 21:20:09 2019
+++ src/sys/kern/subr_cpu.c Sat Dec 21 11:35:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpu.c,v 1.1 2019/12/20 21:20:09 ad Exp $ */
+/* $NetBSD: subr_cpu.c,v 1.2 2019/12/21 11:35:25 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.1 2019/12/20 21:20:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.2 2019/12/21 11:35:25 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -85,8 +85,6 @@ struct cpu_info **cpu_infos __read_most
kcpuset_t * kcpuset_attached __read_mostly = NULL;
kcpuset_t * kcpuset_running __read_mostly = NULL;
-int (*compat_cpuctl_ioctl)(struct lwp *, u_long, void *) = (void *)enosys;
-
static char cpu_model[128];
/*