[Xen-changelog] Clean up #include in a few places, and fix non-CONFIG_SMP builds.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1434, 2005/05/10 23:28:46+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Clean up #include in a few places, and fix non-CONFIG_SMP builds.
        xen/slab.h has unused __ARCH_HAS_SLAB_ALLOCATOR removed, but I added
        back include xen/mm.h for the time being -- it can go after ia64 is
        cleaned up to include mm.h only where necessary.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 common/page_alloc.c      |    1 +
 common/schedule.c        |    1 +
 drivers/char/console.c   |    2 +-
 include/asm-x86/shadow.h |    1 +
 include/xen/cpumask.h    |    2 ++
 include/xen/slab.h       |    9 +--------
 6 files changed, 7 insertions(+), 9 deletions(-)


diff -Nru a/xen/common/page_alloc.c b/xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   2005-05-10 19:04:04 -04:00
+++ b/xen/common/page_alloc.c   2005-05-10 19:04:04 -04:00
@@ -28,6 +28,7 @@
 #include <xen/sched.h>
 #include <xen/spinlock.h>
 #include <xen/slab.h>
+#include <xen/mm.h>
 #include <xen/irq.h>
 #include <xen/softirq.h>
 #include <xen/shadow.h>
diff -Nru a/xen/common/schedule.c b/xen/common/schedule.c
--- a/xen/common/schedule.c     2005-05-10 19:04:04 -04:00
+++ b/xen/common/schedule.c     2005-05-10 19:04:04 -04:00
@@ -34,6 +34,7 @@
 #include <xen/sched-if.h>
 #include <xen/softirq.h>
 #include <xen/trace.h>
+#include <xen/mm.h>
 #include <public/sched_ctl.h>
 
 /* opt_sched: scheduler - default to Borrowed Virtual Time */
diff -Nru a/xen/drivers/char/console.c b/xen/drivers/char/console.c
--- a/xen/drivers/char/console.c        2005-05-10 19:04:04 -04:00
+++ b/xen/drivers/char/console.c        2005-05-10 19:04:04 -04:00
@@ -17,8 +17,8 @@
 #include <xen/console.h>
 #include <xen/serial.h>
 #include <xen/keyhandler.h>
+#include <xen/mm.h>
 #include <asm/uaccess.h>
-#include <asm/mm.h>
 #include <asm/debugger.h>
 #include <asm/io.h>
 
diff -Nru a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h      2005-05-10 19:04:04 -04:00
+++ b/xen/include/asm-x86/shadow.h      2005-05-10 19:04:04 -04:00
@@ -26,6 +26,7 @@
 #include <xen/types.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
+#include <xen/mm.h>
 #include <asm/processor.h>
 #include <asm/domain_page.h>
 #include <public/dom0_ops.h>
diff -Nru a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
--- a/xen/include/xen/cpumask.h 2005-05-10 19:04:04 -04:00
+++ b/xen/include/xen/cpumask.h 2005-05-10 19:04:04 -04:00
@@ -9,7 +9,9 @@
 
 typedef u32 cpumask_t;
 
+#ifndef cpu_online_map
 extern cpumask_t cpu_online_map;
+#endif
 
 static inline int cpus_weight(cpumask_t w)
 {
diff -Nru a/xen/include/xen/slab.h b/xen/include/xen/slab.h
--- a/xen/include/xen/slab.h    2005-05-10 19:04:04 -04:00
+++ b/xen/include/xen/slab.h    2005-05-10 19:04:04 -04:00
@@ -3,12 +3,7 @@
 #define __SLAB_H__
 
 #include <xen/config.h>
-
-#ifdef __ARCH_HAS_SLAB_ALLOCATOR
-
-#include <asm/slab.h>
-
-#else
+#include <xen/mm.h>
 
 /* Allocate space for typed object. */
 #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
@@ -31,7 +26,5 @@
                return NULL;
        return _xmalloc(size * num, align);
 }
-
-#endif /* __ARCH_HAS_SLAB_ALLOCATOR */
 
 #endif /* __SLAB_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog