ChangeSet 1.1649, 2005/06/02 21:27:34+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxxx>
b/xen/arch/x86/dmi_scan.c | 2 +-
b/xen/arch/x86/io_apic.c | 3 ++-
b/xen/arch/x86/microcode.c | 2 +-
b/xen/arch/x86/mtrr/generic.c | 2 +-
b/xen/arch/x86/x86_32/asm-offsets.c | 1 +
b/xen/arch/x86/x86_64/asm-offsets.c | 1 +
b/xen/common/dom_mem_ops.c | 1 +
b/xen/common/multicall.c | 1 +
b/xen/common/page_alloc.c | 1 -
b/xen/common/sched_bvt.c | 1 -
b/xen/common/sched_sedf.c | 2 +-
b/xen/common/trace.c | 1 -
b/xen/include/xen/lib.h | 2 +-
b/xen/include/xen/sched.h | 6 ------
b/xen/include/xen/xmalloc.h | 27 +++++++++++++++++++++++++++
xen/include/xen/slab.h | 27 ---------------------------
16 files changed, 38 insertions(+), 42 deletions(-)
diff -Nru a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
--- a/xen/arch/x86/dmi_scan.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/dmi_scan.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/io_apic.c 2005-06-02 18:03:44 -04:00
@@ -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 @@
#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 -Nru a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
--- a/xen/arch/x86/microcode.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/microcode.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/arch/x86/mtrr/generic.c b/xen/arch/x86/mtrr/generic.c
--- a/xen/arch/x86/mtrr/generic.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/mtrr/generic.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/arch/x86/x86_32/asm-offsets.c
b/xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/x86_32/asm-offsets.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/arch/x86/x86_64/asm-offsets.c
b/xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c 2005-06-02 18:03:44 -04:00
+++ b/xen/arch/x86/x86_64/asm-offsets.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
--- a/xen/common/dom_mem_ops.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/dom_mem_ops.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/multicall.c b/xen/common/multicall.c
--- a/xen/common/multicall.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/multicall.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/page_alloc.c b/xen/common/page_alloc.c
--- a/xen/common/page_alloc.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/page_alloc.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/sched_bvt.c b/xen/common/sched_bvt.c
--- a/xen/common/sched_bvt.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/sched_bvt.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c
--- a/xen/common/sched_sedf.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/sched_sedf.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/common/trace.c b/xen/common/trace.c
--- a/xen/common/trace.c 2005-06-02 18:03:44 -04:00
+++ b/xen/common/trace.c 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/include/xen/lib.h b/xen/include/xen/lib.h
--- a/xen/include/xen/lib.h 2005-06-02 18:03:44 -04:00
+++ b/xen/include/xen/lib.h 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/include/xen/sched.h b/xen/include/xen/sched.h
--- a/xen/include/xen/sched.h 2005-06-02 18:03:44 -04:00
+++ b/xen/include/xen/sched.h 2005-06-02 18:03:44 -04:00
@@ -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 -Nru a/xen/include/xen/slab.h b/xen/include/xen/slab.h
--- a/xen/include/xen/slab.h 2005-06-02 18:03:44 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,27 +0,0 @@
-
-#ifndef __SLAB_H__
-#define __SLAB_H__
-
-/* Allocate space for typed object. */
-#define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
-
-/* Allocate space for array of typed objects. */
-#define xmalloc_array(_type, _num) ((_type *)_xmalloc_array(sizeof(_type),
__alignof__(_type), _num))
-
-/* Allocate untyped storage. */
-#define xmalloc_bytes(_bytes) (_xmalloc(_bytes, SMP_CACHE_BYTES))
-
-/* Free any of the above. */
-extern void xfree(const void *);
-
-/* Underlying functions */
-extern void *_xmalloc(size_t size, size_t align);
-static inline void *_xmalloc_array(size_t size, size_t align, size_t num)
-{
- /* Check for overflow. */
- if (size && num > UINT_MAX / size)
- return NULL;
- return _xmalloc(size * num, align);
-}
-
-#endif /* __SLAB_H__ */
diff -Nru a/xen/include/xen/xmalloc.h b/xen/include/xen/xmalloc.h
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/xen/include/xen/xmalloc.h 2005-06-02 18:03:44 -04:00
@@ -0,0 +1,27 @@
+
+#ifndef __XMALLOC_H__
+#define __XMALLOC_H__
+
+/* Allocate space for typed object. */
+#define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
+
+/* Allocate space for array of typed objects. */
+#define xmalloc_array(_type, _num) ((_type *)_xmalloc_array(sizeof(_type),
__alignof__(_type), _num))
+
+/* Allocate untyped storage. */
+#define xmalloc_bytes(_bytes) (_xmalloc(_bytes, SMP_CACHE_BYTES))
+
+/* Free any of the above. */
+extern void xfree(const void *);
+
+/* Underlying functions */
+extern void *_xmalloc(size_t size, size_t align);
+static inline void *_xmalloc_array(size_t size, size_t align, size_t num)
+{
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home