Sat Aug 7 21:58:34 2010 UTC ()
acpi_madt.h is gone


(cegger)
diff -r1.52 -r1.53 src/sys/arch/xen/xen/hypervisor.c
cvs diff -r1.52 -r1.53 src/sys/arch/xen/xen/hypervisor.c (expand / switch to unified diff)

--- src/sys/arch/xen/xen/hypervisor.c 2010/04/28 19:17:04 1.52
+++ src/sys/arch/xen/xen/hypervisor.c 2010/08/07 21:58:34 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: hypervisor.c,v 1.52 2010/04/28 19:17:04 dyoung Exp $ */ 1/* $NetBSD: hypervisor.c,v 1.53 2010/08/07 21:58:34 cegger Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Manuel Bouyer. 4 * Copyright (c) 2005 Manuel Bouyer.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -43,27 +43,27 @@ @@ -43,27 +43,27 @@
43 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 43 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
44 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 44 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
45 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 45 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
46 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 46 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
47 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 47 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
48 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 48 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
49 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 49 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
50 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 50 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
51 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 51 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52 */ 52 */
53 53
54 54
55#include <sys/cdefs.h> 55#include <sys/cdefs.h>
56__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.52 2010/04/28 19:17:04 dyoung Exp $"); 56__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.53 2010/08/07 21:58:34 cegger Exp $");
57 57
58#include <sys/param.h> 58#include <sys/param.h>
59#include <sys/systm.h> 59#include <sys/systm.h>
60#include <sys/device.h> 60#include <sys/device.h>
61#include <sys/malloc.h> 61#include <sys/malloc.h>
62 62
63#include "xenbus.h" 63#include "xenbus.h"
64#include "xencons.h" 64#include "xencons.h"
65#ifndef __x86_64__ 65#ifndef __x86_64__
66#include "npx.h" 66#include "npx.h"
67#else 67#else
68#define NNPX 0 68#define NNPX 0
69#endif /* __x86_64__ */ 69#endif /* __x86_64__ */
@@ -83,27 +83,26 @@ __KERNEL_RCSID(0, "$NetBSD: hypervisor.c @@ -83,27 +83,26 @@ __KERNEL_RCSID(0, "$NetBSD: hypervisor.c
83#include <sys/stat.h> 83#include <sys/stat.h>
84#include <sys/tree.h> 84#include <sys/tree.h>
85#include <sys/vnode.h> 85#include <sys/vnode.h>
86#include <miscfs/specfs/specdev.h> 86#include <miscfs/specfs/specdev.h>
87#include <miscfs/kernfs/kernfs.h> 87#include <miscfs/kernfs/kernfs.h>
88#include <xen/kernfs_machdep.h> 88#include <xen/kernfs_machdep.h>
89#include <dev/isa/isavar.h> 89#include <dev/isa/isavar.h>
90#include <xen/granttables.h> 90#include <xen/granttables.h>
91#include <xen/vcpuvar.h> 91#include <xen/vcpuvar.h>
92#if NPCI > 0 92#if NPCI > 0
93#include <dev/pci/pcivar.h> 93#include <dev/pci/pcivar.h>
94#if NACPICA > 0 94#if NACPICA > 0
95#include <dev/acpi/acpivar.h> 95#include <dev/acpi/acpivar.h>
96#include <dev/acpi/acpi_madt.h>  
97#include <machine/mpconfig.h> 96#include <machine/mpconfig.h>
98#include <xen/mpacpi.h>  97#include <xen/mpacpi.h>
99#endif 98#endif
100#ifdef MPBIOS 99#ifdef MPBIOS
101#include <machine/mpbiosvar.h>  100#include <machine/mpbiosvar.h>
102#endif 101#endif
103#endif /* NPCI */ 102#endif /* NPCI */
104 103
105#if NXENBUS > 0 104#if NXENBUS > 0
106#include <xen/xenbus.h> 105#include <xen/xenbus.h>
107#endif 106#endif
108 107
109#if NXENNET_HYPERVISOR > 0 108#if NXENNET_HYPERVISOR > 0