# HG changeset patch
# User Christoph Egger <Christoph.Egger@xxxxxxx>
# Date 1305902347 -3600
# Node ID d65c1f12b214c8cef48322b7ac0cf4892e96d89c
# Parent c2a55fe9c006beb340a422af18467fc5c36fac94
xen: Include headers that are actually needed, drop everything else.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/domain.c Fri May 20 15:39:07 2011 +0100
@@ -34,6 +34,7 @@
#include <xen/paging.h>
#include <xen/cpu.h>
#include <xen/wait.h>
+#include <xen/guest_access.h>
#include <public/sysctl.h>
#include <asm/regs.h>
#include <asm/mc146818rtc.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c Fri May 20 15:39:07 2011 +0100
@@ -26,6 +26,7 @@
#include <xen/softirq.h>
#include <xen/hypercall.h>
#include <xen/domain_page.h>
+#include <xen/xenoprof.h>
#include <asm/current.h>
#include <asm/io.h>
#include <asm/paging.h>
@@ -38,6 +39,7 @@
#include <asm/types.h>
#include <asm/debugreg.h>
#include <asm/msr.h>
+#include <asm/i387.h>
#include <asm/spinlock.h>
#include <asm/hvm/emulate.h>
#include <asm/hvm/hvm.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/hvm/svm/vmcb.c
--- a/xen/arch/x86/hvm/svm/vmcb.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/hvm/svm/vmcb.c Fri May 20 15:39:07 2011 +0100
@@ -20,24 +20,17 @@
#include <xen/config.h>
#include <xen/init.h>
+#include <xen/lib.h>
+#include <xen/keyhandler.h>
#include <xen/mm.h>
-#include <xen/lib.h>
-#include <xen/errno.h>
-#include <asm/cpufeature.h>
-#include <asm/processor.h>
-#include <asm/msr.h>
+#include <xen/rcupdate.h>
+#include <xen/sched.h>
+#include <asm/hvm/svm/vmcb.h>
+#include <asm/msr-index.h>
#include <asm/p2m.h>
-#include <asm/hvm/hvm.h>
-#include <asm/hvm/io.h>
#include <asm/hvm/support.h>
#include <asm/hvm/svm/svm.h>
-#include <asm/hvm/svm/intr.h>
-#include <asm/hvm/svm/asid.h>
#include <asm/hvm/svm/svmdebug.h>
-#include <xen/event.h>
-#include <xen/kernel.h>
-#include <xen/domain_page.h>
-#include <xen/keyhandler.h>
extern int svm_dbg_on;
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/hvm/svm/vpmu.c
--- a/xen/arch/x86/hvm/svm/vpmu.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/hvm/svm/vpmu.c Fri May 20 15:39:07 2011 +0100
@@ -23,17 +23,11 @@
*/
#include <xen/config.h>
+#include <xen/xenoprof.h>
+#include <xen/hvm/save.h>
#include <xen/sched.h>
-#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>
#include <asm/hvm/vlapic.h>
-#include <public/sched.h>
-#include <public/hvm/save.h>
#include <asm/hvm/vpmu.h>
#define F10H_NUM_COUNTERS 4
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/hvm/vmx/vpmu_core2.c
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c Fri May 20 15:39:07 2011 +0100
@@ -21,6 +21,7 @@
#include <xen/config.h>
#include <xen/sched.h>
+#include <xen/xenoprof.h>
#include <asm/system.h>
#include <asm/regs.h>
#include <asm/types.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/hvm/vpmu.c
--- a/xen/arch/x86/hvm/vpmu.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/hvm/vpmu.c Fri May 20 15:39:07 2011 +0100
@@ -21,14 +21,13 @@
#include <xen/config.h>
#include <xen/sched.h>
+#include <xen/xenoprof.h>
#include <asm/regs.h>
#include <asm/types.h>
#include <asm/msr.h>
#include <asm/hvm/support.h>
#include <asm/hvm/vmx/vmx.h>
#include <asm/hvm/vmx/vmcs.h>
-#include <public/sched.h>
-#include <public/hvm/save.h>
#include <asm/hvm/vpmu.h>
#include <asm/hvm/svm/svm.h>
#include <asm/hvm/svm/vmcb.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/machine_kexec.c
--- a/xen/arch/x86/machine_kexec.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/machine_kexec.c Fri May 20 15:39:07 2011 +0100
@@ -6,18 +6,10 @@
* - Magnus Damm <magnus@xxxxxxxxxxxxx>
*/
-#include <xen/lib.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-#include <asm/flushtlb.h>
-#include <xen/smp.h>
-#include <xen/nmi.h>
#include <xen/types.h>
-#include <xen/console.h>
#include <xen/kexec.h>
-#include <xen/domain_page.h>
+#include <xen/guest_access.h>
#include <asm/fixmap.h>
-#include <asm/hvm/hvm.h>
#include <asm/hpet.h>
typedef void (*relocate_new_kernel_t)(
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/mm.c Fri May 20 15:39:07 2011 +0100
@@ -101,6 +101,7 @@
#include <xen/guest_access.h>
#include <xen/pfn.h>
#include <xen/xmalloc.h>
+#include <xen/grant_table.h>
#include <asm/paging.h>
#include <asm/shadow.h>
#include <asm/page.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/mm/mem_sharing.c Fri May 20 15:39:07 2011 +0100
@@ -20,16 +20,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <xen/types.h>
+#include <xen/domain_page.h>
+#include <xen/spinlock.h>
+#include <xen/mm.h>
+#include <xen/grant_table.h>
+#include <xen/sched.h>
#include <asm/page.h>
#include <asm/string.h>
#include <asm/p2m.h>
#include <asm/mem_event.h>
#include <asm/atomic.h>
-#include <xen/domain_page.h>
-#include <xen/types.h>
-#include <xen/spinlock.h>
-#include <xen/mm.h>
-#include <xen/sched.h>
/* Auditing of memory sharing code? */
#define MEM_SHARING_AUDIT 0
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/oprofile/nmi_int.c
--- a/xen/arch/x86/oprofile/nmi_int.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/oprofile/nmi_int.c Fri May 20 15:39:07 2011 +0100
@@ -16,13 +16,14 @@
#include <xen/errno.h>
#include <xen/init.h>
#include <xen/nmi.h>
+#include <xen/string.h>
+#include <xen/delay.h>
+#include <xen/xenoprof.h>
#include <public/xen.h>
#include <asm/msr.h>
#include <asm/apic.h>
#include <asm/regs.h>
#include <asm/current.h>
-#include <xen/delay.h>
-#include <xen/string.h>
#include "op_counter.h"
#include "op_x86_model.h"
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/oprofile/op_model_athlon.c
--- a/xen/arch/x86/oprofile/op_model_athlon.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/oprofile/op_model_athlon.c Fri May 20 15:39:07 2011 +0100
@@ -15,7 +15,7 @@
#include <asm/io.h>
#include <asm/apic.h>
#include <asm/processor.h>
-#include <xen/sched.h>
+#include <xen/xenoprof.h>
#include <asm/regs.h>
#include <asm/current.h>
#include <asm/hvm/support.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/oprofile/op_model_p4.c
--- a/xen/arch/x86/oprofile/op_model_p4.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/oprofile/op_model_p4.c Fri May 20 15:39:07 2011 +0100
@@ -13,7 +13,7 @@
#include <asm/io.h>
#include <asm/apic.h>
#include <asm/processor.h>
-#include <xen/sched.h>
+#include <xen/xenoprof.h>
#include <asm/regs.h>
#include <asm/current.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/oprofile/op_model_ppro.c
--- a/xen/arch/x86/oprofile/op_model_ppro.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/oprofile/op_model_ppro.c Fri May 20 15:39:07 2011 +0100
@@ -11,11 +11,12 @@
*/
#include <xen/types.h>
+#include <xen/xenoprof.h>
+#include <xen/sched.h>
#include <asm/msr.h>
#include <asm/io.h>
#include <asm/apic.h>
#include <asm/processor.h>
-#include <xen/sched.h>
#include <asm/regs.h>
#include <asm/current.h>
#include <asm/hvm/vpmu.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/traps.c Fri May 20 15:39:07 2011 +0100
@@ -33,6 +33,7 @@
#include <xen/mm.h>
#include <xen/console.h>
#include <xen/shutdown.h>
+#include <xen/guest_access.h>
#include <asm/regs.h>
#include <xen/delay.h>
#include <xen/event.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/x86_32/traps.c Fri May 20 15:39:07 2011 +0100
@@ -12,6 +12,7 @@
#include <xen/shutdown.h>
#include <xen/nmi.h>
#include <xen/cpu.h>
+#include <xen/guest_access.h>
#include <asm/current.h>
#include <asm/flushtlb.h>
#include <asm/traps.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/arch/x86/x86_64/traps.c Fri May 20 15:39:07 2011 +0100
@@ -12,6 +12,7 @@
#include <xen/sched.h>
#include <xen/shutdown.h>
#include <xen/nmi.h>
+#include <xen/guest_access.h>
#include <asm/current.h>
#include <asm/flushtlb.h>
#include <asm/traps.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/common/domain.c
--- a/xen/common/domain.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/common/domain.c Fri May 20 15:39:07 2011 +0100
@@ -28,6 +28,8 @@
#include <xen/multicall.h>
#include <xen/rcupdate.h>
#include <xen/wait.h>
+#include <xen/grant_table.h>
+#include <xen/xenoprof.h>
#include <acpi/cpufreq/cpufreq.h>
#include <asm/debugger.h>
#include <public/sched.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/common/grant_table.c
--- a/xen/common/grant_table.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/common/grant_table.c Fri May 20 15:39:07 2011 +0100
@@ -31,6 +31,7 @@
#include <xen/mm.h>
#include <xen/event.h>
#include <xen/trace.h>
+#include <xen/grant_table.h>
#include <xen/guest_access.h>
#include <xen/domain_page.h>
#include <xen/iommu.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/common/xenoprof.c
--- a/xen/common/xenoprof.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/common/xenoprof.c Fri May 20 15:39:07 2011 +0100
@@ -13,6 +13,7 @@
#include <xen/guest_access.h>
#include <xen/sched.h>
#include <xen/event.h>
+#include <xen/xenoprof.h>
#include <public/xenoprof.h>
#include <xen/paging.h>
#include <xsm/xsm.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/drivers/char/console.c
--- a/xen/drivers/char/console.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/drivers/char/console.c Fri May 20 15:39:07 2011 +0100
@@ -10,31 +10,20 @@
* Ported to Xen - Steven Rostedt - Red Hat
*/
-#include <xen/stdarg.h>
-#include <xen/config.h>
#include <xen/version.h>
-#include <xen/init.h>
#include <xen/lib.h>
-#include <xen/errno.h>
#include <xen/event.h>
-#include <xen/spinlock.h>
#include <xen/console.h>
#include <xen/serial.h>
#include <xen/softirq.h>
-#include <xen/tasklet.h>
#include <xen/keyhandler.h>
-#include <xen/mm.h>
#include <xen/delay.h>
#include <xen/guest_access.h>
#include <xen/shutdown.h>
#include <xen/vga.h>
#include <xen/kexec.h>
-#include <asm/current.h>
#include <asm/debugger.h>
-#include <asm/io.h>
#include <asm/div64.h>
-#include <xsm/xsm.h>
-#include <public/sysctl.h>
#include <xen/hypercall.h> /* for do_console_io */
/* console: comma-separated list of console outputs. */
diff -r c2a55fe9c006 -r d65c1f12b214 xen/drivers/char/ns16550.c
--- a/xen/drivers/char/ns16550.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/drivers/char/ns16550.c Fri May 20 15:39:07 2011 +0100
@@ -13,6 +13,8 @@
#include <xen/init.h>
#include <xen/irq.h>
#include <xen/sched.h>
+#include <xen/pci.h>
+#include <xen/timer.h>
#include <xen/serial.h>
#include <xen/iocap.h>
#include <asm/io.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/drivers/char/serial.c
--- a/xen/drivers/char/serial.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/drivers/char/serial.c Fri May 20 15:39:07 2011 +0100
@@ -9,11 +9,9 @@
#include <xen/config.h>
#include <xen/delay.h>
#include <xen/init.h>
-#include <xen/irq.h>
-#include <xen/keyhandler.h>
-#include <xen/sched.h>
#include <xen/mm.h>
#include <xen/serial.h>
+#include <xen/cache.h>
/* Never drop characters, even if the async transmit buffer fills. */
/* #define SERIAL_NEVER_DROP_CHARS 1 */
diff -r c2a55fe9c006 -r d65c1f12b214 xen/drivers/video/vesa.c
--- a/xen/drivers/video/vesa.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/drivers/video/vesa.c Fri May 20 15:39:07 2011 +0100
@@ -7,10 +7,10 @@
#include <xen/config.h>
#include <xen/init.h>
#include <xen/lib.h>
-#include <xen/mm.h>
-#include <xen/errno.h>
-#include <xen/console.h>
+#include <xen/xmalloc.h>
+#include <xen/kernel.h>
#include <xen/vga.h>
+#include <asm/page.h>
#include "font.h"
#define vlfb_info vga_console_info.u.vesa_lfb
diff -r c2a55fe9c006 -r d65c1f12b214 xen/drivers/video/vga.c
--- a/xen/drivers/video/vga.c Fri May 20 13:42:23 2011 +0100
+++ b/xen/drivers/video/vga.c Fri May 20 15:39:07 2011 +0100
@@ -8,8 +8,6 @@
#include <xen/init.h>
#include <xen/lib.h>
#include <xen/mm.h>
-#include <xen/errno.h>
-#include <xen/console.h>
#include <xen/vga.h>
#include <asm/io.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/fixmap.h
--- a/xen/include/asm-x86/fixmap.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/fixmap.h Fri May 20 15:39:07 2011 +0100
@@ -13,12 +13,12 @@
#define _ASM_FIXMAP_H
#include <xen/config.h>
+#include <xen/pfn.h>
+#include <xen/kexec.h>
+#include <xen/iommu.h>
#include <asm/apicdef.h>
#include <asm/acpi.h>
#include <asm/page.h>
-#include <xen/pfn.h>
-#include <xen/kexec.h>
-#include <xen/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/msi.h>
#include <acpi/apei.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/hvm/support.h
--- a/xen/include/asm-x86/hvm/support.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/hvm/support.h Fri May 20 15:39:07 2011 +0100
@@ -21,10 +21,10 @@
#ifndef __ASM_X86_HVM_SUPPORT_H__
#define __ASM_X86_HVM_SUPPORT_H__
+#include <xen/types.h>
+#include <public/hvm/ioreq.h>
#include <xen/sched.h>
#include <xen/hvm/save.h>
-#include <asm/types.h>
-#include <asm/regs.h>
#include <asm/processor.h>
static inline ioreq_t *get_ioreq(struct vcpu *v)
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/hvm/svm/asid.h
--- a/xen/include/asm-x86/hvm/svm/asid.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/hvm/svm/asid.h Fri May 20 15:39:07 2011 +0100
@@ -20,13 +20,9 @@
#define __ASM_X86_HVM_SVM_ASID_H__
#include <xen/config.h>
-#include <asm/types.h>
-#include <asm/hvm/hvm.h>
+#include <xen/types.h>
#include <asm/hvm/asid.h>
-#include <asm/hvm/support.h>
-#include <asm/hvm/svm/svm.h>
-#include <asm/hvm/svm/vmcb.h>
-#include <asm/percpu.h>
+#include <asm/processor.h>
void svm_asid_init(struct cpuinfo_x86 *c);
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/hvm/svm/emulate.h
--- a/xen/include/asm-x86/hvm/svm/emulate.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/hvm/svm/emulate.h Fri May 20 15:39:07 2011 +0100
@@ -42,6 +42,8 @@
INSTR_MAX_COUNT /* Must be last - Number of instructions supported */
};
+struct vcpu;
+
int __get_instruction_length_from_list(
struct vcpu *v, enum instruction_index *list, unsigned int list_count);
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/hvm/svm/svm.h
--- a/xen/include/asm-x86/hvm/svm/svm.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/hvm/svm/svm.h Fri May 20 15:39:07 2011 +0100
@@ -21,13 +21,8 @@
#ifndef __ASM_X86_HVM_SVM_H__
#define __ASM_X86_HVM_SVM_H__
-#include <xen/sched.h>
-#include <asm/types.h>
-#include <asm/regs.h>
-#include <asm/processor.h>
-#include <asm/hvm/svm/vmcb.h>
-#include <asm/i387.h>
-#include <asm/hvm/vpmu.h>
+#include <xen/types.h>
+#include <xen/bitmap.h>
#define SVM_REG_EAX (0)
#define SVM_REG_ECX (1)
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/hvm/svm/vmcb.h
--- a/xen/include/asm-x86/hvm/svm/vmcb.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/hvm/svm/vmcb.h Fri May 20 15:39:07 2011 +0100
@@ -20,8 +20,9 @@
#ifndef __ASM_X86_HVM_SVM_VMCB_H__
#define __ASM_X86_HVM_SVM_VMCB_H__
-#include <asm/config.h>
-#include <asm/hvm/hvm.h>
+#include <xen/config.h>
+#include <xen/types.h>
+#include <asm/hvm/emulate.h>
/* general 1 intercepts */
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/asm-x86/msi.h
--- a/xen/include/asm-x86/msi.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/asm-x86/msi.h Fri May 20 15:39:07 2011 +0100
@@ -2,6 +2,8 @@
#define __ASM_MSI_H
#include <xen/cpumask.h>
+#include <xen/pci.h>
+
/*
* Constants for Intel APIC based MSI messages.
*/
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/public/hvm/save.h
--- a/xen/include/public/hvm/save.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/public/hvm/save.h Fri May 20 15:39:07 2011 +0100
@@ -67,6 +67,7 @@
struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \
struct __HVM_SAVE_TYPE_COMPAT_##_x { _ctype t; }
+# include <xen/lib.h> /* BUG() */
# define DECLARE_HVM_SAVE_TYPE(_x, _code, _type) \
static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { BUG(); return -1;
} \
struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[1];}; \
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/console.h
--- a/xen/include/xen/console.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/console.h Fri May 20 15:39:07 2011 +0100
@@ -7,8 +7,7 @@
#ifndef __CONSOLE_H__
#define __CONSOLE_H__
-#include <xen/spinlock.h>
-#include <xen/guest_access.h>
+#include <xen/inttypes.h>
#include <public/xen.h>
struct xen_sysctl_readconsole;
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/hvm/save.h
--- a/xen/include/xen/hvm/save.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/hvm/save.h Fri May 20 15:39:07 2011 +0100
@@ -18,9 +18,9 @@
#ifndef __XEN_HVM_SAVE_H__
#define __XEN_HVM_SAVE_H__
+#include <xen/types.h>
#include <public/xen.h>
#include <public/hvm/save.h>
-#include <asm/types.h>
/* Marshalling and unmarshalling uses a buffer with size and cursor. */
typedef struct hvm_domain_context {
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/sched.h
--- a/xen/include/xen/sched.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/sched.h Fri May 20 15:39:07 2011 +0100
@@ -5,26 +5,19 @@
#include <xen/config.h>
#include <xen/types.h>
#include <xen/spinlock.h>
-#include <xen/smp.h>
#include <xen/shared.h>
+#include <xen/timer.h>
+#include <xen/rangeset.h>
+#include <xen/domain.h>
+#include <xen/rcupdate.h>
+#include <xen/cpumask.h>
+#include <xen/nodemask.h>
+#include <xen/multicall.h>
#include <public/xen.h>
#include <public/domctl.h>
#include <public/sysctl.h>
#include <public/vcpu.h>
-#include <xen/time.h>
-#include <xen/timer.h>
-#include <xen/grant_table.h>
-#include <xen/rangeset.h>
-#include <xen/domain.h>
-#include <xen/xenoprof.h>
-#include <xen/rcupdate.h>
-#include <xen/irq.h>
-#include <xen/mm.h>
-#include <xen/tasklet.h>
#include <public/mem_event.h>
-#include <xen/cpumask.h>
-#include <xen/nodemask.h>
-#include <xen/multicall.h>
#ifdef CONFIG_COMPAT
#include <compat/vcpu.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/serial.h
--- a/xen/include/xen/serial.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/serial.h Fri May 20 15:39:07 2011 +0100
@@ -9,6 +9,8 @@
#ifndef __XEN_SERIAL_H__
#define __XEN_SERIAL_H__
+#include <xen/spinlock.h>
+
struct cpu_user_regs;
/* Register a character-receive hook on the specified COM port. */
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/tasklet.h
--- a/xen/include/xen/tasklet.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/tasklet.h Fri May 20 15:39:07 2011 +0100
@@ -10,6 +10,7 @@
#include <xen/types.h>
#include <xen/list.h>
+#include <xen/percpu.h>
struct tasklet
{
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/vga.h
--- a/xen/include/xen/vga.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/vga.h Fri May 20 15:39:07 2011 +0100
@@ -10,6 +10,7 @@
#define _XEN_VGA_H
#include <xen/config.h>
+#include <public/xen.h>
#ifdef CONFIG_VGA
extern struct xen_vga_console_info vga_console_info;
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/xenoprof.h
--- a/xen/include/xen/xenoprof.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/xenoprof.h Fri May 20 15:39:07 2011 +0100
@@ -11,6 +11,7 @@
#define __XEN_XENOPROF_H__
#include <xen/config.h>
+#include <xen/inttypes.h>
#include <public/xenoprof.h>
#include <asm/xenoprof.h>
diff -r c2a55fe9c006 -r d65c1f12b214 xen/include/xen/xmalloc.h
--- a/xen/include/xen/xmalloc.h Fri May 20 13:42:23 2011 +0100
+++ b/xen/include/xen/xmalloc.h Fri May 20 15:39:07 2011 +0100
@@ -2,6 +2,9 @@
#ifndef __XMALLOC_H__
#define __XMALLOC_H__
+#include <xen/types.h>
+#include <xen/cache.h>
+
/*
* Xen malloc/free-style interface.
*/
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|