diff options
44 files changed, 50 insertions, 28 deletions
@@ -1445,7 +1445,6 @@ 3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xen/sched.h 403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xen/serial.h 4252c315hw0xXYMKIfFzhomi1M1yNA xen/include/xen/shadow.h -3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/slab.h 3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xen/smp.h 3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xen/softirq.h 3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xen/spinlock.h @@ -1453,6 +1452,7 @@ 3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xen/time.h 403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xen/trace.h 3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xen/types.h +3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/xmalloc.h 41d291f5u3J3HYViXLs3cNuFGTvzNg xen/tools/Makefile 3eb3c87fc79FXLA6R9TvdBJNTvQDwA xen/tools/figlet/LICENSE 3eb3c87fPL2T_zBb0bHlbZY-ACEKRw xen/tools/figlet/Makefile diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c index 19f6147648..5b25f53cd5 100644 --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -28,7 +28,7 @@ #include <xen/init.h> #include <xen/acpi.h> #include <xen/irq.h> -#include <xen/sched.h> +#include <asm/fixmap.h> #include <asm/page.h> #include <asm/apic.h> #include <asm/io_apic.h> diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 06a8142322..fcb5c16ecb 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -3,6 +3,7 @@ #include <xen/string.h> #include <xen/delay.h> #include <xen/smp.h> +#include <asm/current.h> #include <asm/processor.h> #include <asm/i387.h> #include <asm/msr.h> diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 13c8d97915..3bb1820c66 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -1,10 +1,10 @@ #include <xen/config.h> #include <xen/types.h> +#include <xen/lib.h> #include <xen/kernel.h> #include <xen/string.h> #include <xen/init.h> #include <xen/cache.h> -#include <xen/slab.h> #include <xen/acpi.h> #include <asm/io.h> #include <asm/system.h> diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c index 1984b64825..93c00b9208 100644 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -5,6 +5,7 @@ #define APIC_DEFINITION 1 #include <xen/config.h> #include <xen/cpumask.h> +#include <asm/current.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c index 2fe4da78ea..d84cf41141 100644 --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -4,6 +4,7 @@ #define APIC_DEFINITION 1 #include <xen/config.h> #include <xen/cpumask.h> +#include <asm/current.h> #include <asm/mpspec.h> #include <asm/mach-default/mach_apicdef.h> #include <asm/genapic.h> diff --git a/xen/arch/x86/genapic/es7000.c b/xen/arch/x86/genapic/es7000.c index 9e68384863..05e94b0f04 100644 --- a/xen/arch/x86/genapic/es7000.c +++ b/xen/arch/x86/genapic/es7000.c @@ -4,6 +4,7 @@ #define APIC_DEFINITION 1 #include <xen/config.h> #include <xen/cpumask.h> +#include <asm/current.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> diff --git a/xen/arch/x86/genapic/summit.c b/xen/arch/x86/genapic/summit.c index bbca9d8632..28a47f09de 100644 --- a/xen/arch/x86/genapic/summit.c +++ b/xen/arch/x86/genapic/summit.c @@ -4,6 +4,7 @@ #define APIC_DEFINITION 1 #include <xen/config.h> #include <xen/cpumask.h> +#include <asm/current.h> #include <asm/mpspec.h> #include <asm/genapic.h> #include <asm/fixmap.h> diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index a83190fcea..eb5ff9479b 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -10,6 +10,7 @@ #include <xen/config.h> #include <xen/sched.h> +#include <asm/current.h> #include <asm/processor.h> #include <asm/i387.h> diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 71a8260453..a0020c7ec2 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -21,6 +21,7 @@ */ #include <xen/config.h> +#include <xen/lib.h> #include <xen/init.h> #include <xen/irq.h> #include <xen/delay.h> @@ -234,7 +235,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) #if defined(CONFIG_IRQBALANCE) # include <asm/processor.h> /* kernel_thread() */ # include <xen/kernel_stat.h> /* kstat */ -# include <xen/slab.h> /* kmalloc() */ +# include <xen/xmalloc.h> /* kmalloc() */ # include <xen/timer.h> /* time_after() */ # ifdef CONFIG_BALANCED_IRQ_DEBUG diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f548ca6f52..a5657e72f8 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -11,6 +11,7 @@ #include <xen/irq.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <asm/current.h> #include <asm/smpboot.h> irq_desc_t irq_desc[NR_IRQS]; diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index fcf4f94125..a7bd0e5d68 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -70,12 +70,14 @@ */ #include <xen/config.h> +#include <xen/lib.h> #include <xen/kernel.h> #include <xen/init.h> #include <xen/sched.h> -#include <xen/slab.h> +#include <xen/smp.h> #include <xen/spinlock.h> +#include <asm/current.h> #include <asm/msr.h> #include <asm/uaccess.h> #include <asm/processor.h> diff --git a/xen/arch/x86/mtrr/generic.c b/xen/arch/x86/mtrr/generic.c index 899069acf4..9ab5be4ec6 100644 --- a/xen/arch/x86/mtrr/generic.c +++ b/xen/arch/x86/mtrr/generic.c @@ -1,8 +1,8 @@ /* This only handles 32bit MTRR on 32bit hosts. This is strictly wrong because MTRRs can span upto 40 bits (36bits on most modern x86) */ +#include <xen/lib.h> #include <xen/init.h> #include <xen/mm.h> -#include <xen/slab.h> #include <asm/flushtlb.h> #include <asm/io.h> #include <asm/mtrr.h> diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c5728be7bc..0e03b6a674 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -21,8 +21,9 @@ #include <xen/time.h> #include <xen/sched.h> #include <xen/console.h> +#include <xen/smp.h> +#include <asm/current.h> #include <asm/mc146818rtc.h> -#include <asm/smp.h> #include <asm/msr.h> #include <asm/mpspec.h> #include <asm/debugger.h> diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 94cf15e2eb..6eba1bfb22 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -6,6 +6,7 @@ #include <xen/sched.h> #include <xen/irq.h> #include <xen/event.h> +#include <asm/current.h> #include <asm/smpboot.h> #include <public/xen.h> #include <public/physdev.h> diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 9598ff2e93..7f108b240e 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -14,6 +14,7 @@ #include <xen/delay.h> #include <xen/perfc.h> #include <xen/spinlock.h> +#include <asm/current.h> #include <asm/smp.h> #include <asm/mc146818rtc.h> #include <asm/flushtlb.h> diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 8bd89a9902..382fee8d15 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -40,6 +40,7 @@ #include <xen/sched.h> #include <xen/irq.h> #include <xen/delay.h> +#include <asm/current.h> #include <asm/mc146818rtc.h> #include <asm/desc.h> #include <asm/div64.h> diff --git a/xen/arch/x86/vmx_io.c b/xen/arch/x86/vmx_io.c index 6a537178a4..95fa95aec8 100644 --- a/xen/arch/x86/vmx_io.c +++ b/xen/arch/x86/vmx_io.c @@ -23,6 +23,7 @@ #include <xen/errno.h> #include <xen/trace.h> +#include <asm/current.h> #include <asm/cpufeature.h> #include <asm/processor.h> #include <asm/msr.h> diff --git a/xen/arch/x86/vmx_vmcs.c b/xen/arch/x86/vmx_vmcs.c index 03f396fb9d..fa01316aa2 100644 --- a/xen/arch/x86/vmx_vmcs.c +++ b/xen/arch/x86/vmx_vmcs.c @@ -23,6 +23,7 @@ #include <xen/lib.h> #include <xen/errno.h> +#include <asm/current.h> #include <asm/cpufeature.h> #include <asm/processor.h> #include <asm/msr.h> diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c index 1c4515996e..2a9f84ba4c 100644 --- a/xen/arch/x86/x86_32/asm-offsets.c +++ b/xen/arch/x86/x86_32/asm-offsets.c @@ -7,6 +7,8 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <asm/fixmap.h> +#include <asm/hardirq.h> #define DEFINE(_sym, _val) \ __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) ) diff --git a/xen/arch/x86/x86_32/domain_page.c b/xen/arch/x86/x86_32/domain_page.c index 08673b2986..40d0f8f964 100644 --- a/xen/arch/x86/x86_32/domain_page.c +++ b/xen/arch/x86/x86_32/domain_page.c @@ -15,6 +15,7 @@ #include <xen/sched.h> #include <xen/mm.h> #include <xen/perfc.h> +#include <asm/current.h> #include <asm/domain_page.h> #include <asm/flushtlb.h> #include <asm/hardirq.h> diff --git a/xen/arch/x86/x86_32/mm.c b/xen/arch/x86/x86_32/mm.c index 46a4116dae..89537fe7af 100644 --- a/xen/arch/x86/x86_32/mm.c +++ b/xen/arch/x86/x86_32/mm.c @@ -22,6 +22,7 @@ #include <xen/lib.h> #include <xen/init.h> #include <xen/mm.h> +#include <asm/current.h> #include <asm/page.h> #include <asm/flushtlb.h> #include <asm/fixmap.h> diff --git a/xen/arch/x86/x86_32/seg_fixup.c b/xen/arch/x86/x86_32/seg_fixup.c index 6b9ec395bb..9931825f60 100644 --- a/xen/arch/x86/x86_32/seg_fixup.c +++ b/xen/arch/x86/x86_32/seg_fixup.c @@ -27,6 +27,7 @@ #include <xen/errno.h> #include <xen/mm.h> #include <xen/perfc.h> +#include <asm/current.h> #include <asm/processor.h> #include <asm/regs.h> #include <asm/x86_emulate.h> diff --git a/xen/arch/x86/x86_32/traps.c b/xen/arch/x86/x86_32/traps.c index 904080d628..b950707989 100644 --- a/xen/arch/x86/x86_32/traps.c +++ b/xen/arch/x86/x86_32/traps.c @@ -6,6 +6,7 @@ #include <xen/console.h> #include <xen/mm.h> #include <xen/irq.h> +#include <asm/current.h> #include <asm/flushtlb.h> #ifdef CONFIG_VMX diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index e8698f9d04..d19610a99f 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -7,6 +7,8 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <asm/fixmap.h> +#include <asm/hardirq.h> #define DEFINE(_sym, _val) \ __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) ) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index adc863fe23..66d3e96d61 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -22,6 +22,7 @@ #include <xen/init.h> #include <xen/mm.h> #include <xen/sched.h> +#include <asm/current.h> #include <asm/asm_defns.h> #include <asm/page.h> #include <asm/flushtlb.h> diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index e4042d5bcd..0d7429cf14 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -8,6 +8,7 @@ #include <xen/irq.h> #include <xen/console.h> #include <xen/sched.h> +#include <asm/current.h> #include <asm/flushtlb.h> #include <asm/msr.h> diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index 35edcaf65a..89654c7c45 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -18,6 +18,7 @@ #include <xen/trace.h> #include <xen/console.h> #include <public/sched_ctl.h> +#include <asm/current.h> extern long arch_do_dom0_op(dom0_op_t *op, dom0_op_t *u_dom0_op); extern void arch_getdomaininfo_ctxt( diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index 40aa522eb0..9e974be44d 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -14,7 +14,9 @@ #include <xen/sched.h> #include <xen/event.h> #include <xen/shadow.h> +#include <asm/current.h> #include <asm/domain_page.h> +#include <asm/hardirq.h> /* * To allow safe resume of do_dom_mem_op() after preemption, we need to know diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index cb51b60edb..d2f0c47452 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -22,6 +22,7 @@ #include <xen/sched.h> #include <xen/event.h> #include <xen/irq.h> +#include <asm/current.h> #include <public/xen.h> #include <public/event_channel.h> diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d577cbc2a0..3acaac8e1b 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -13,6 +13,7 @@ #include <xen/errno.h> #include <xen/compile.h> #include <xen/sched.h> +#include <asm/current.h> void cmdline_parse(char *cmdline) { diff --git a/xen/common/multicall.c b/xen/common/multicall.c index 1403041db8..a3af8ef221 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -10,6 +10,8 @@ #include <xen/sched.h> #include <xen/event.h> #include <xen/multicall.h> +#include <asm/current.h> +#include <asm/hardirq.h> struct mc_state mc_state[NR_CPUS]; diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5b388cafbf..50b1268e85 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -27,7 +27,6 @@ #include <xen/perfc.h> #include <xen/sched.h> #include <xen/spinlock.h> -#include <xen/slab.h> #include <xen/mm.h> #include <xen/irq.h> #include <xen/softirq.h> diff --git a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c index b683d27c39..c37b4bf2f9 100644 --- a/xen/common/sched_bvt.c +++ b/xen/common/sched_bvt.c @@ -23,7 +23,6 @@ #include <xen/ac_timer.h> #include <xen/perfc.h> #include <xen/sched-if.h> -#include <xen/slab.h> #include <xen/softirq.h> /* all per-domain BVT-specific scheduling info is stored here */ diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c index a53a6fa1e5..ab64af3a64 100644 --- a/xen/common/sched_sedf.c +++ b/xen/common/sched_sedf.c @@ -5,13 +5,13 @@ * based on code by Mark Williamson (C) 2004 Intel Research Cambridge */ +#include <xen/lib.h> #include <xen/sched.h> #include <xen/sched-if.h> #include <public/sched_ctl.h> #include <xen/ac_timer.h> #include <xen/softirq.h> #include <xen/time.h> -#include <xen/slab.h> /*verbosity settings*/ #define SEDFLEVEL 0 diff --git a/xen/common/trace.c b/xen/common/trace.c index 952a2f9583..291d35dd28 100644 --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -23,7 +23,6 @@ #include <asm/io.h> #include <xen/lib.h> #include <xen/sched.h> -#include <xen/slab.h> #include <xen/smp.h> #include <xen/trace.h> #include <xen/errno.h> diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 4e6eb50f11..6f6234c8d0 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -18,6 +18,8 @@ #include <xen/serial.h> #include <xen/keyhandler.h> #include <xen/mm.h> +#include <xen/delay.h> +#include <asm/current.h> #include <asm/uaccess.h> #include <asm/debugger.h> #include <asm/io.h> diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index c8319f7445..6099a6e8a3 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -27,6 +27,7 @@ #include <xen/perfc.h> #include <xen/sched.h> #include <xen/mm.h> +#include <asm/current.h> #include <asm/flushtlb.h> #include <asm/processor.h> #include <asm/domain_page.h> diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h index 08995644e8..c70f4d90fc 100644 --- a/xen/include/asm-x86/smp.h +++ b/xen/include/asm-x86/smp.h @@ -8,7 +8,6 @@ #include <xen/config.h> #include <xen/kernel.h> #include <xen/cpumask.h> -#include <asm/current.h> #endif #ifdef CONFIG_X86_LOCAL_APIC diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 279d3723db..a7d911771d 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -11,6 +11,7 @@ #include <xen/config.h> #include <xen/sched.h> +#include <xen/smp.h> #include <asm/bitops.h> /* diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 367456e99e..2c77b43056 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -5,7 +5,7 @@ #include <stdarg.h> #include <xen/config.h> #include <xen/types.h> -#include <xen/slab.h> +#include <xen/xmalloc.h> #include <xen/string.h> #define BUG() do { \ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 281e830451..3376f9e30e 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -5,23 +5,11 @@ #include <xen/config.h> #include <xen/types.h> #include <xen/spinlock.h> -#include <xen/cache.h> #include <xen/smp.h> -#include <asm/page.h> -#include <asm/processor.h> #include <public/xen.h> #include <public/dom0_ops.h> -#include <xen/list.h> -#include <xen/time.h> -#include <xen/ac_timer.h> -#include <xen/delay.h> -#include <asm/atomic.h> -#include <asm/current.h> -#include <xen/spinlock.h> #include <xen/grant_table.h> -#include <asm/hardirq.h> #include <asm/domain.h> -#include <asm/bitops.h> extern unsigned long volatile jiffies; extern rwlock_t domlist_lock; diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index de3480482a..87d6c807ee 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -17,6 +17,7 @@ #include <xen/lib.h> #include <xen/smp.h> #include <asm/bitops.h> +#include <asm/current.h> #include <asm/hardirq.h> typedef void (*softirq_handler)(void); diff --git a/xen/include/xen/slab.h b/xen/include/xen/xmalloc.h index 4736dede90..893627f04a 100644 --- a/xen/include/xen/slab.h +++ b/xen/include/xen/xmalloc.h @@ -1,6 +1,6 @@ -#ifndef __SLAB_H__ -#define __SLAB_H__ +#ifndef __XMALLOC_H__ +#define __XMALLOC_H__ /* Allocate space for typed object. */ #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type))) @@ -24,4 +24,4 @@ static inline void *_xmalloc_array(size_t size, size_t align, size_t num) return _xmalloc(size * num, align); } -#endif /* __SLAB_H__ */ +#endif /* __XMALLOC_H__ */ |