Module Name: src
Committed By: ad
Date: Wed Dec 18 19:40:34 UTC 2019
Modified Files:
src/sys/kern: kern_cpu.c
Log Message:
Passify rump build.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/kern_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.85 src/sys/kern/kern_cpu.c:1.86
--- src/sys/kern/kern_cpu.c:1.85 Tue Dec 17 00:59:14 2019
+++ src/sys/kern/kern_cpu.c Wed Dec 18 19:40:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.85 2019/12/17 00:59:14 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.86 2019/12/18 19:40:34 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.85 2019/12/17 00:59:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.86 2019/12/18 19:40:34 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -91,13 +91,13 @@ __KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v
* verify that the claim is true. This will prevent them from getting out
* of sync.
*/
+#ifndef _RUMPKERNEL /* XXX temporary */
#ifdef __HAVE_CPU_DATA_FIRST
CTASSERT(offsetof(struct cpu_info, ci_data) == 0);
#else
CTASSERT(offsetof(struct cpu_info, ci_data) != 0);
#endif
-#ifndef _RUMPKERNEL /* XXX temporary */
static void cpu_xc_online(struct cpu_info *, void *);
static void cpu_xc_offline(struct cpu_info *, void *);
