Sat Aug 7 21:59:11 2010 UTC ()
acpi_madt.h is gone


(cegger)
diff -r1.11 -r1.12 src/sys/arch/xen/x86/mainbus.c
cvs diff -r1.11 -r1.12 src/sys/arch/xen/x86/Attic/mainbus.c (expand / switch to unified diff)

--- src/sys/arch/xen/x86/Attic/mainbus.c 2010/04/28 19:17:04 1.11
+++ src/sys/arch/xen/x86/Attic/mainbus.c 2010/08/07 21:59:11 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mainbus.c,v 1.11 2010/04/28 19:17:04 dyoung Exp $ */ 1/* $NetBSD: mainbus.c,v 1.12 2010/08/07 21:59:11 cegger Exp $ */
2/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */ 2/* NetBSD: mainbus.c,v 1.53 2003/10/27 14:11:47 junyoung Exp */
3 3
4/* 4/*
5 * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. 5 * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -22,27 +22,27 @@ @@ -22,27 +22,27 @@
22 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 22 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
25 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 25 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
26 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 26 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
27 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
29 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
31 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2010/04/28 19:17:04 dyoung Exp $"); 35__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2010/08/07 21:59:11 cegger Exp $");
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/systm.h> 38#include <sys/systm.h>
39#include <sys/device.h> 39#include <sys/device.h>
40 40
41#include <machine/bus.h> 41#include <machine/bus.h>
42 42
43#include "hypervisor.h" 43#include "hypervisor.h"
44#include "pci.h" 44#include "pci.h"
45 45
46#include "opt_xen.h" 46#include "opt_xen.h"
47#include "opt_mpbios.h" 47#include "opt_mpbios.h"
48#include "opt_pcifixup.h" 48#include "opt_pcifixup.h"
@@ -56,27 +56,26 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v  @@ -56,27 +56,26 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
56#include <machine/i82093var.h> 56#include <machine/i82093var.h>
57 57
58#include <xen/xen.h> 58#include <xen/xen.h>
59#include <xen/hypervisor.h> 59#include <xen/hypervisor.h>
60 60
61#if NIPMI > 0 61#if NIPMI > 0
62#include <x86/ipmivar.h> 62#include <x86/ipmivar.h>
63#endif 63#endif
64 64
65#if NPCI > 0 65#if NPCI > 0
66#include <dev/pci/pcivar.h> 66#include <dev/pci/pcivar.h>
67#if NACPICA > 0 67#if NACPICA > 0
68#include <dev/acpi/acpivar.h> 68#include <dev/acpi/acpivar.h>
69#include <dev/acpi/acpi_madt.h>  
70#include <xen/mpacpi.h>  69#include <xen/mpacpi.h>
71#endif /* NACPICA > 0 */ 70#endif /* NACPICA > 0 */
72#ifdef MPBIOS 71#ifdef MPBIOS
73#include <machine/mpbiosvar.h>  72#include <machine/mpbiosvar.h>
74#endif /* MPBIOS */ 73#endif /* MPBIOS */
75#ifdef PCI_BUS_FIXUP 74#ifdef PCI_BUS_FIXUP
76#include <arch/x86/pci/pci_bus_fixup.h> 75#include <arch/x86/pci/pci_bus_fixup.h>
77#ifdef PCI_ADDR_FIXUP 76#ifdef PCI_ADDR_FIXUP
78#include <arch/x86/pci/pci_addr_fixup.h> 77#include <arch/x86/pci/pci_addr_fixup.h>
79#endif  78#endif
80#endif 79#endif
81 80
82#if defined(MPBIOS) || NACPICA > 0 81#if defined(MPBIOS) || NACPICA > 0