diff options
author | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 20:27:34 +0000 |
---|---|---|
committer | cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk> | 2005-06-02 20:27:34 +0000 |
commit | 42825bdf1d9d4e1b560e4d37a5a8500b595796eb (patch) | |
tree | 1a92c57122d1af4be602b9f0f366d5e2112db5ab | |
parent | 4e8fab61b579a23ee89277729f5596417d4bc555 (diff) | |
download | xen-42825bdf1d9d4e1b560e4d37a5a8500b595796eb.tar.gz xen-42825bdf1d9d4e1b560e4d37a5a8500b595796eb.tar.bz2 xen-42825bdf1d9d4e1b560e4d37a5a8500b595796eb.zip |
bitkeeper revision 1.1649 (429f6bb65KQm70mnFwO33ykh9n1qag)
sched.h:
g/c unneeded include.
Many files:
Rename xen/slab.h to xen/xmalloc.h and fix resulting fallout.
xmalloc.h:
Rename: xen/include/xen/slab.h -> xen/include/xen/xmalloc.h
sched.h, multicall.c, dom_mem_ops.c, asm-offsets.c:
cleanup incorrect includes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
-rw-r--r-- | .rootkeys | 2 | ||||
-rw-r--r-- | xen/arch/x86/dmi_scan.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/io_apic.c | 3 | ||||
-rw-r--r-- | xen/arch/x86/microcode.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/mtrr/generic.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/x86_32/asm-offsets.c | 1 | ||||
-rw-r--r-- | xen/arch/x86/x86_64/asm-offsets.c | 1 | ||||
-rw-r--r-- | xen/common/dom_mem_ops.c | 1 | ||||
-rw-r--r-- | xen/common/multicall.c | 1 | ||||
-rw-r--r-- | xen/common/page_alloc.c | 1 | ||||
-rw-r--r-- | xen/common/sched_bvt.c | 1 | ||||
-rw-r--r-- | xen/common/sched_sedf.c | 2 | ||||
-rw-r--r-- | xen/common/trace.c | 1 | ||||
-rw-r--r-- | xen/include/xen/lib.h | 2 | ||||
-rw-r--r-- | xen/include/xen/sched.h | 6 | ||||
-rw-r--r-- | xen/include/xen/xmalloc.h (renamed from xen/include/xen/slab.h) | 6 |
16 files changed, 15 insertions, 19 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/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/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/microcode.c b/xen/arch/x86/microcode.c index fcf4f94125..6e47acea3f 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -70,10 +70,10 @@ */ #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/spinlock.h> #include <asm/msr.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/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c index b12d19bd80..efc4aa3ecf 100644 --- a/xen/arch/x86/x86_32/asm-offsets.c +++ b/xen/arch/x86/x86_32/asm-offsets.c @@ -7,6 +7,7 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.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/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index fdb1359c76..29e3808736 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -7,6 +7,7 @@ #include <xen/config.h> #include <xen/perfc.h> #include <xen/sched.h> +#include <asm/hardirq.h> #define DEFINE(_sym, _val) \ __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) ) diff --git a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c index 40aa522eb0..41a4406f0c 100644 --- a/xen/common/dom_mem_ops.c +++ b/xen/common/dom_mem_ops.c @@ -15,6 +15,7 @@ #include <xen/event.h> #include <xen/shadow.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/multicall.c b/xen/common/multicall.c index 1403041db8..3f6921353b 100644 --- a/xen/common/multicall.c +++ b/xen/common/multicall.c @@ -10,6 +10,7 @@ #include <xen/sched.h> #include <xen/event.h> #include <xen/multicall.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 580698c53b..35f901fccc 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 646f4e8bd9..15420e6eb4 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/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 43d218fc00..366f3ae661 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -7,21 +7,15 @@ #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/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__ */ |