Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build msr_ipifuncs on Xen, fixes the build with XEN2_DOM0.

Browse Source
This commit is contained in:
xtraeme 2007-03-21 00:16:52 +00:00
parent d68cf1be1a
commit 545c3b7ca9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/x86/include/cpuvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuvar.h,v 1.11 2007/03/20 21:22:03 xtraeme Exp $ */ /* $NetBSD: cpuvar.h,v 1.12 2007/03/21 00:16:52 xtraeme Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -94,7 +94,9 @@ struct cpu_attach_args {
#ifdef _KERNEL #ifdef _KERNEL
#include "opt_multiprocessor.h" #include "opt_multiprocessor.h"
#ifndef XEN
#include "opt_intel_odcm.h" #include "opt_intel_odcm.h"
#endif
#ifdef MULTIPROCESSOR #ifdef MULTIPROCESSOR
extern u_int32_t cpus_running; extern u_int32_t cpus_running;

6
sys/arch/x86/x86/x86_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: x86_machdep.c,v 1.9 2007/03/20 21:07:39 xtraeme Exp $ */ /* $NetBSD: x86_machdep.c,v 1.10 2007/03/21 00:16:52 xtraeme Exp $ */
/*- /*-
* Copyright (c) 2005 The NetBSD Foundation, Inc. * Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.9 2007/03/20 21:07:39 xtraeme Exp $"); __KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.10 2007/03/21 00:16:52 xtraeme Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -134,5 +134,7 @@ x86_pause(void)
void void
x86_init(void) x86_init(void)
{ {
#ifndef XEN
msr_cpu_broadcast_initmtx(); msr_cpu_broadcast_initmtx();
#endif
} }