# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1276274869 -3600
# Node ID 06c384172152e52df06ede4c517fa5d59b5837ad
# Parent 7706fb5cd87c0ff949c03e172f6aebf5a2a3fbb5
x86: Do not include apic.h/io_apic.h from asm/smp.h
...and fix up the ensuing fall-out of implicit dependencies
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/arch/x86/acpi/cpu_idle.c | 1 +
xen/arch/x86/acpi/power.c | 3 ++-
xen/arch/x86/cpu/amd.c | 1 +
xen/arch/x86/cpu/mcheck/mce_intel.c | 1 +
xen/arch/x86/crash.c | 2 ++
xen/arch/x86/domain_build.c | 1 +
xen/arch/x86/genapic/bigsmp.c | 1 +
xen/arch/x86/genapic/default.c | 1 +
xen/arch/x86/genapic/summit.c | 1 +
xen/arch/x86/genapic/x2apic.c | 4 ++++
xen/arch/x86/hvm/hvm.c | 1 +
xen/arch/x86/hvm/svm/svm.c | 1 +
xen/arch/x86/hvm/svm/vpmu.c | 1 +
xen/arch/x86/hvm/vioapic.c | 1 +
xen/arch/x86/hvm/viridian.c | 1 +
xen/arch/x86/hvm/vlapic.c | 8 ++++++++
xen/arch/x86/hvm/vmsi.c | 1 +
xen/arch/x86/hvm/vmx/vmx.c | 1 +
xen/arch/x86/hvm/vmx/vpmu_core2.c | 1 +
xen/arch/x86/hvm/vpt.c | 1 +
xen/arch/x86/mm.c | 1 +
xen/arch/x86/numa.c | 5 +++++
xen/arch/x86/platform_hypercall.c | 1 +
xen/arch/x86/shutdown.c | 1 +
xen/arch/x86/smp.c | 10 ++++++++++
xen/arch/x86/traps.c | 1 +
xen/arch/x86/x86_32/domain_page.c | 1 +
xen/arch/x86/x86_64/mmconfig-shared.c | 2 ++
xen/arch/x86/x86_64/mmconfig_64.c | 2 ++
xen/common/shutdown.c | 1 +
xen/drivers/passthrough/amd/iommu_acpi.c | 1 +
xen/drivers/passthrough/amd/iommu_intr.c | 1 +
xen/drivers/passthrough/pci.c | 3 +++
xen/drivers/passthrough/vtd/intremap.c | 2 ++
xen/drivers/passthrough/vtd/utils.c | 4 ++++
xen/drivers/passthrough/vtd/x86/vtd.c | 1 +
xen/include/asm-x86/apic.h | 3 ---
xen/include/asm-x86/bzimage.h | 1 +
xen/include/asm-x86/config.h | 5 +++++
xen/include/asm-x86/hvm/vlapic.h | 6 +-----
xen/include/asm-x86/mach-generic/mach_apic.h | 2 ++
xen/include/asm-x86/numa.h | 6 ++----
xen/include/asm-x86/smp.h | 23 ++---------------------
xen/include/xen/irq.h | 1 +
44 files changed, 83 insertions(+), 34 deletions(-)
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/acpi/cpu_idle.c
--- a/xen/arch/x86/acpi/cpu_idle.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/acpi/cpu_idle.c Fri Jun 11 17:47:49 2010 +0100
@@ -51,6 +51,7 @@
#include <public/platform.h>
#include <public/sysctl.h>
#include <acpi/cpufreq/cpufreq.h>
+#include <asm/apic.h>
/*#define DEBUG_PM_CX*/
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/acpi/power.c
--- a/xen/arch/x86/acpi/power.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/acpi/power.c Fri Jun 11 17:47:49 2010 +0100
@@ -28,7 +28,8 @@
#include <xen/cpu.h>
#include <public/platform.h>
#include <asm/tboot.h>
-
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <acpi/cpufreq/cpufreq.h>
uint32_t system_reset_counter = 1;
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/cpu/amd.c
--- a/xen/arch/x86/cpu/amd.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/cpu/amd.c Fri Jun 11 17:47:49 2010 +0100
@@ -9,6 +9,7 @@
#include <asm/processor.h>
#include <asm/hvm/support.h>
#include <asm/setup.h> /* amd_init_cpu */
+#include <asm/acpi.h>
#include "cpu.h"
#include "amd.h"
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Fri Jun 11 17:47:49 2010 +0100
@@ -13,6 +13,7 @@
#include <asm/msr.h>
#include <asm/p2m.h>
#include <asm/mce.h>
+#include <asm/apic.h>
#include "mce.h"
#include "x86_mca.h"
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/crash.c
--- a/xen/arch/x86/crash.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/crash.c Fri Jun 11 17:47:49 2010 +0100
@@ -26,6 +26,8 @@
#include <asm/shared.h>
#include <asm/hvm/support.h>
#include <asm/hpet.h>
+#include <asm/apic.h>
+#include <asm/io_apic.h>
static atomic_t waiting_for_crash_ipi;
static unsigned int crashing_cpu;
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/domain_build.c Fri Jun 11 17:47:49 2010 +0100
@@ -32,6 +32,7 @@
#include <asm/e820.h>
#include <asm/acpi.h>
#include <asm/bzimage.h> /* for bzimage_parse */
+#include <asm/io_apic.h>
#include <public/version.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/genapic/bigsmp.c
--- a/xen/arch/x86/genapic/bigsmp.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/genapic/bigsmp.c Fri Jun 11 17:47:49 2010 +0100
@@ -10,6 +10,7 @@
#include <xen/init.h>
#include <xen/dmi.h>
#include <asm/mach-default/mach_mpparse.h>
+#include <asm/io_apic.h>
static int dmi_bigsmp; /* can be set by dmi scanners */
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/genapic/default.c
--- a/xen/arch/x86/genapic/default.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/genapic/default.c Fri Jun 11 17:47:49 2010 +0100
@@ -12,6 +12,7 @@
#include <xen/string.h>
#include <xen/smp.h>
#include <xen/init.h>
+#include <asm/io_apic.h>
#include <asm/mach-default/mach_mpparse.h>
/* should be called last. */
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/genapic/summit.c
--- a/xen/arch/x86/genapic/summit.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/genapic/summit.c Fri Jun 11 17:47:49 2010 +0100
@@ -13,6 +13,7 @@
#include <xen/smp.h>
#include <xen/init.h>
#include <asm/mach-summit/mach_mpparse.h>
+#include <asm/io_apic.h>
static __init int probe_summit(void)
{
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/genapic/x2apic.c
--- a/xen/arch/x86/genapic/x2apic.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/genapic/x2apic.c Fri Jun 11 17:47:49 2010 +0100
@@ -17,9 +17,13 @@
* Place - Suite 330, Boston, MA 02111-1307 USA.
*/
+#include <xen/config.h>
+#include <xen/init.h>
#include <xen/cpumask.h>
#include <asm/apicdef.h>
#include <asm/genapic.h>
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <xen/smp.h>
#include <asm/mach-default/mach_mpparse.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/hvm.c Fri Jun 11 17:47:49 2010 +0100
@@ -55,6 +55,7 @@
#include <asm/hvm/cacheattr.h>
#include <asm/hvm/trace.h>
#include <asm/mtrr.h>
+#include <asm/apic.h>
#include <public/sched.h>
#include <public/hvm/ioreq.h>
#include <public/version.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c Fri Jun 11 17:47:49 2010 +0100
@@ -53,6 +53,7 @@
#include <asm/hvm/vpt.h>
#include <asm/hvm/trace.h>
#include <asm/hap.h>
+#include <asm/apic.h>
#include <asm/debugger.h>
u32 svm_feature_flags;
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/svm/vpmu.c
--- a/xen/arch/x86/hvm/svm/vpmu.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/svm/vpmu.c Fri Jun 11 17:47:49 2010 +0100
@@ -27,6 +27,7 @@
#include <asm/system.h>
#include <asm/regs.h>
#include <asm/types.h>
+#include <asm/apic.h>
#include <asm/msr.h>
#include <asm/msr-index.h>
#include <asm/hvm/support.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vioapic.c
--- a/xen/arch/x86/hvm/vioapic.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vioapic.c Fri Jun 11 17:47:49 2010 +0100
@@ -39,6 +39,7 @@
#include <asm/hvm/support.h>
#include <asm/current.h>
#include <asm/event.h>
+#include <asm/io_apic.h>
/* HACK: Route IRQ0 only to VCPU0 to prevent time jumps. */
#define IRQ0_SPECIAL_ROUTING 1
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/viridian.c
--- a/xen/arch/x86/hvm/viridian.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/viridian.c Fri Jun 11 17:47:49 2010 +0100
@@ -11,6 +11,7 @@
#include <xen/domain_page.h>
#include <asm/paging.h>
#include <asm/p2m.h>
+#include <asm/apic.h>
#include <asm/hvm/support.h>
#include <public/sched.h>
#include <public/hvm/hvm_op.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vlapic.c
--- a/xen/arch/x86/hvm/vlapic.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vlapic.c Fri Jun 11 17:47:49 2010 +0100
@@ -31,6 +31,8 @@
#include <xen/numa.h>
#include <asm/current.h>
#include <asm/page.h>
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <asm/hvm/hvm.h>
#include <asm/hvm/io.h>
#include <asm/hvm/support.h>
@@ -803,6 +805,12 @@ int vlapic_ack_pending_irq(struct vcpu *
return 1;
}
+bool_t is_vlapic_lvtpc_enabled(struct vlapic *vlapic)
+{
+ return (vlapic_enabled(vlapic) &&
+ !(vlapic_get_reg(vlapic, APIC_LVTPC) & APIC_LVT_MASKED));
+}
+
/* Reset the VLPAIC back to its power-on/reset state. */
void vlapic_reset(struct vlapic *vlapic)
{
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vmsi.c
--- a/xen/arch/x86/hvm/vmsi.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vmsi.c Fri Jun 11 17:47:49 2010 +0100
@@ -39,6 +39,7 @@
#include <asm/hvm/support.h>
#include <asm/current.h>
#include <asm/event.h>
+#include <asm/io_apic.h>
static void vmsi_inj_irq(
struct domain *d,
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Jun 11 17:47:49 2010 +0100
@@ -53,6 +53,7 @@
#include <asm/hvm/trace.h>
#include <asm/xenoprof.h>
#include <asm/debugger.h>
+#include <asm/apic.h>
enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vmx/vpmu_core2.c
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c Fri Jun 11 17:47:49 2010 +0100
@@ -24,6 +24,7 @@
#include <asm/system.h>
#include <asm/regs.h>
#include <asm/types.h>
+#include <asm/apic.h>
#include <asm/msr.h>
#include <asm/msr-index.h>
#include <asm/hvm/support.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/hvm/vpt.c
--- a/xen/arch/x86/hvm/vpt.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/hvm/vpt.c Fri Jun 11 17:47:49 2010 +0100
@@ -21,6 +21,7 @@
#include <asm/hvm/support.h>
#include <asm/hvm/vpt.h>
#include <asm/event.h>
+#include <asm/apic.h>
#define mode_is(d, name) \
((d)->arch.hvm_domain.params[HVM_PARAM_TIMER_MODE] == HVMPTM_##name)
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/mm.c Fri Jun 11 17:47:49 2010 +0100
@@ -114,6 +114,7 @@
#include <xsm/xsm.h>
#include <xen/trace.h>
#include <asm/setup.h>
+#include <asm/fixmap.h>
#include <asm/mem_sharing.h>
/*
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/numa.c
--- a/xen/arch/x86/numa.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/numa.c Fri Jun 11 17:47:49 2010 +0100
@@ -50,6 +50,11 @@ int numa_off __devinitdata = 0;
int numa_off __devinitdata = 0;
int acpi_numa __devinitdata;
+
+int srat_disabled(void)
+{
+ return numa_off || acpi_numa < 0;
+}
/*
* Given a shift value, try to populate memnodemap[]
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/platform_hypercall.c
--- a/xen/arch/x86/platform_hypercall.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/platform_hypercall.c Fri Jun 11 17:47:49 2010 +0100
@@ -25,6 +25,7 @@
#include <acpi/cpufreq/processor_perf.h>
#include <asm/edd.h>
#include <asm/mtrr.h>
+#include <asm/io_apic.h>
#include "cpu/mtrr/mtrr.h"
#include <xsm/xsm.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/shutdown.c
--- a/xen/arch/x86/shutdown.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/shutdown.c Fri Jun 11 17:47:49 2010 +0100
@@ -23,6 +23,7 @@
#include <asm/processor.h>
#include <asm/mpspec.h>
#include <asm/tboot.h>
+#include <asm/apic.h>
enum reboot_type {
BOOT_TRIPLE = 't',
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/smp.c
--- a/xen/arch/x86/smp.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/smp.c Fri Jun 11 17:47:49 2010 +0100
@@ -22,6 +22,16 @@
#include <asm/hvm/support.h>
#include <mach_apic.h>
+int hard_smp_processor_id(void)
+{
+ return get_apic_id();
+}
+
+int logical_smp_processor_id(void)
+{
+ return get_logical_apic_id();
+}
+
/*
* send_IPI_mask(cpumask, vector): sends @vector IPI to CPUs in @cpumask,
* excluding the local CPU. @cpumask may be empty.
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/traps.c Fri Jun 11 17:47:49 2010 +0100
@@ -66,6 +66,7 @@
#include <asm/hvm/vpt.h>
#include <asm/hypercall.h>
#include <asm/mce.h>
+#include <asm/apic.h>
#include <public/arch-x86/cpuid.h>
/*
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/x86_32/domain_page.c
--- a/xen/arch/x86/x86_32/domain_page.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/x86_32/domain_page.c Fri Jun 11 17:47:49 2010 +0100
@@ -15,6 +15,7 @@
#include <asm/flushtlb.h>
#include <asm/hardirq.h>
#include <asm/hvm/support.h>
+#include <asm/fixmap.h>
static inline struct vcpu *mapcache_current_vcpu(void)
{
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/x86_64/mmconfig-shared.c
--- a/xen/arch/x86/x86_64/mmconfig-shared.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/x86_64/mmconfig-shared.c Fri Jun 11 17:47:49 2010 +0100
@@ -12,6 +12,8 @@
* Author: Allen Kay <allen.m.kay@xxxxxxxxx> - adapted to xen from Linux
*/
+#include <xen/config.h>
+#include <xen/init.h>
#include <xen/mm.h>
#include <xen/acpi.h>
#include <xen/xmalloc.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/arch/x86/x86_64/mmconfig_64.c
--- a/xen/arch/x86/x86_64/mmconfig_64.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/arch/x86/x86_64/mmconfig_64.c Fri Jun 11 17:47:49 2010 +0100
@@ -7,6 +7,8 @@
* copied from Linux
*/
+#include <xen/config.h>
+#include <xen/init.h>
#include <xen/mm.h>
#include <xen/acpi.h>
#include <xen/xmalloc.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/common/shutdown.c
--- a/xen/common/shutdown.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/common/shutdown.c Fri Jun 11 17:47:49 2010 +0100
@@ -6,6 +6,7 @@
#include <xen/delay.h>
#include <xen/shutdown.h>
#include <xen/console.h>
+#include <xen/kexec.h>
#include <asm/debugger.h>
#include <public/sched.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/amd/iommu_acpi.c
--- a/xen/drivers/passthrough/amd/iommu_acpi.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/amd/iommu_acpi.c Fri Jun 11 17:47:49 2010 +0100
@@ -20,6 +20,7 @@
#include <xen/config.h>
#include <xen/errno.h>
+#include <asm/apicdef.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include <asm/hvm/svm/amd-iommu-acpi.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/amd/iommu_intr.c
--- a/xen/drivers/passthrough/amd/iommu_intr.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/amd/iommu_intr.c Fri Jun 11 17:47:49 2010 +0100
@@ -21,6 +21,7 @@
#include <xen/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
+#include <asm/io_apic.h>
#define INTREMAP_TABLE_ORDER 1
#define INTREMAP_LENGTH 0xB
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/pci.c
--- a/xen/drivers/passthrough/pci.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/pci.c Fri Jun 11 17:47:49 2010 +0100
@@ -26,6 +26,9 @@
#include <xen/delay.h>
#include <xen/keyhandler.h>
#include <xen/tasklet.h>
+#ifdef CONFIG_X86
+#include <asm/msi.h>
+#endif
LIST_HEAD(alldevs_list);
spinlock_t pcidevs_lock = SPIN_LOCK_UNLOCKED;
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/vtd/intremap.c
--- a/xen/drivers/passthrough/vtd/intremap.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/vtd/intremap.c Fri Jun 11 17:47:49 2010 +0100
@@ -35,6 +35,8 @@
#define nr_ioapics iosapic_get_nr_iosapics()
#define nr_ioapic_registers(i) iosapic_get_nr_pins(i)
#else
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#define nr_ioapic_registers(i) nr_ioapic_registers[i]
#endif
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/vtd/utils.c
--- a/xen/drivers/passthrough/vtd/utils.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/vtd/utils.c Fri Jun 11 17:47:49 2010 +0100
@@ -27,6 +27,10 @@
#include "dmar.h"
#include "vtd.h"
#include "extern.h"
+
+#if defined(CONFIG_X86)
+#include <asm/io_apic.h>
+#endif
int is_usb_device(u8 bus, u8 devfn)
{
diff -r 7706fb5cd87c -r 06c384172152 xen/drivers/passthrough/vtd/x86/vtd.c
--- a/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c Fri Jun 11 17:47:49 2010 +0100
@@ -24,6 +24,7 @@
#include <asm/paging.h>
#include <xen/iommu.h>
#include <xen/numa.h>
+#include <asm/fixmap.h>
#include "../iommu.h"
#include "../dmar.h"
#include "../vtd.h"
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/apic.h
--- a/xen/include/asm-x86/apic.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/apic.h Fri Jun 11 17:47:49 2010 +0100
@@ -219,9 +219,6 @@ extern int check_nmi_watchdog (void);
extern int check_nmi_watchdog (void);
extern void enable_NMI_through_LVT0 (void * dummy);
-extern void watchdog_disable(void);
-extern void watchdog_enable(void);
-
extern unsigned int nmi_watchdog;
#define NMI_NONE 0
#define NMI_IO_APIC 1
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/bzimage.h
--- a/xen/include/asm-x86/bzimage.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/bzimage.h Fri Jun 11 17:47:49 2010 +0100
@@ -2,6 +2,7 @@
#define __X86_BZIMAGE_H__
#include <xen/config.h>
+#include <xen/init.h>
int __init bzimage_headroom(char *image_start, unsigned long image_length);
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/config.h Fri Jun 11 17:47:49 2010 +0100
@@ -394,4 +394,9 @@ extern unsigned long xenheap_phys_end;
#define ARCH_CRASH_SAVE_VMCOREINFO
+#ifndef __ASSEMBLY__
+extern void watchdog_disable(void);
+extern void watchdog_enable(void);
+#endif
+
#endif /* __X86_CONFIG_H__ */
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/hvm/vlapic.h
--- a/xen/include/asm-x86/hvm/vlapic.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/hvm/vlapic.h Fri Jun 11 17:47:49 2010 +0100
@@ -74,11 +74,7 @@ static inline void vlapic_set_reg(
*((uint32_t *)(&vlapic->regs->data[reg])) = val;
}
-static inline int is_vlapic_lvtpc_enabled(struct vlapic *vlapic)
-{
- return vlapic_enabled(vlapic) &&
- !(vlapic_get_reg(vlapic, APIC_LVTPC) & APIC_LVT_MASKED);
-}
+bool_t is_vlapic_lvtpc_enabled(struct vlapic *vlapic);
int vlapic_set_irq(struct vlapic *vlapic, uint8_t vec, uint8_t trig);
diff -r 7706fb5cd87c -r 06c384172152
xen/include/asm-x86/mach-generic/mach_apic.h
--- a/xen/include/asm-x86/mach-generic/mach_apic.h Fri Jun 11 16:59:22
2010 +0100
+++ b/xen/include/asm-x86/mach-generic/mach_apic.h Fri Jun 11 17:47:49
2010 +0100
@@ -1,6 +1,8 @@
#ifndef __ASM_MACH_APIC_H
#define __ASM_MACH_APIC_H
+#include <asm/apic.h>
+#include <asm/io_apic.h>
#include <asm/genapic.h>
#include <asm/smp.h>
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/numa.h
--- a/xen/include/asm-x86/numa.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/numa.h Fri Jun 11 17:47:49 2010 +0100
@@ -30,10 +30,8 @@ extern void numa_init_array(void);
extern void numa_init_array(void);
extern int numa_off;
-static __devinit inline int srat_disabled(void)
-{
- return numa_off || acpi_numa < 0;
-}
+
+extern int srat_disabled(void);
extern void numa_set_node(int cpu, int node);
extern int setup_node(int pxm);
extern void srat_detect_node(int cpu);
diff -r 7706fb5cd87c -r 06c384172152 xen/include/asm-x86/smp.h
--- a/xen/include/asm-x86/smp.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/asm-x86/smp.h Fri Jun 11 17:47:49 2010 +0100
@@ -11,15 +11,9 @@
#include <asm/current.h>
#endif
-#ifdef CONFIG_X86_LOCAL_APIC
#ifndef __ASSEMBLY__
#include <asm/bitops.h>
#include <asm/mpspec.h>
-#ifdef CONFIG_X86_IO_APIC
-#include <asm/io_apic.h>
-#endif
-#include <asm/apic.h>
-#endif
#endif
#define BAD_APICID -1U
@@ -64,21 +58,8 @@ int cpu_add(uint32_t apic_id, uint32_t a
*/
#define raw_smp_processor_id() (get_processor_id())
-#ifdef CONFIG_X86_LOCAL_APIC
-
-static inline int hard_smp_processor_id(void)
-{
- /* we don't want to mark this access volatile - bad code generation */
- return get_apic_id();
-}
-
-static __inline int logical_smp_processor_id(void)
-{
- /* we don't want to mark this access volatile - bad code generation */
- return get_logical_apic_id();
-}
-
-#endif
+int hard_smp_processor_id(void);
+int logical_smp_processor_id(void);
#endif /* !__ASSEMBLY__ */
diff -r 7706fb5cd87c -r 06c384172152 xen/include/xen/irq.h
--- a/xen/include/xen/irq.h Fri Jun 11 16:59:22 2010 +0100
+++ b/xen/include/xen/irq.h Fri Jun 11 17:47:49 2010 +0100
@@ -5,6 +5,7 @@
#include <xen/cpumask.h>
#include <xen/spinlock.h>
#include <xen/time.h>
+#include <xen/list.h>
#include <asm/regs.h>
#include <asm/hardirq.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home