bitkeeper revision 1.1619.1.2 (429ce59cTt9KxcOT0JuoCYbuDDPRFw)

Many files:
  Don't include xen/slab.h and xen/domain.h at the _END_ of xen/sched.h.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

11 files changed, 9 insertions, 7 deletions

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 1d42756dc1..13c8d97915 100644
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -3,6 +3,7 @@
 #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>
diff --git a/xen/arch/x86/mtrr/main.c b/xen/arch/x86/mtrr/main.c
index 50c2f428b4..48ea94ae1f 100644
--- a/xen/arch/x86/mtrr/main.c
+++ b/xen/arch/x86/mtrr/main.c
@@ -33,7 +33,7 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
-#include <xen/slab.h>
+#include <xen/lib.h>
 #include <xen/smp.h>
 #include <xen/spinlock.h>
 #include <asm/mtrr.h>
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index ecfc988f05..5a6221c05d 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -3,6 +3,7 @@
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/serial.h>
 #include <xen/softirq.h>
 #include <xen/acpi.h>
diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index 20cef35e29..1e5bcf5cf8 100644
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -12,6 +12,7 @@
 #include <xen/mm.h>
 #include <public/dom0_ops.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/event.h>
 #include <asm/domain_page.h>
 #include <xen/trace.h>
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 0cb93a8f36..72b374e751 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -10,6 +10,7 @@
 #include <xen/sched.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/mm.h>
 #include <xen/event.h>
 #include <xen/time.h>
diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 4bf52e43ff..97467983de 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -26,6 +26,7 @@
 #define GRANT_DEBUG_VERBOSE 0
 
 #include <xen/config.h>
+#include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/shadow.h>
 #include <xen/mm.h>
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 34f9fd9291..a40cea65bc 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -10,6 +10,7 @@
 #include <xen/serial.h>
 #include <xen/sched.h>
 #include <xen/softirq.h>
+#include <xen/domain.h>
 #include <asm/debugger.h>
 
 #define KEY_MAX 256
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 672abaffd4..1e5df627d1 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -26,6 +26,7 @@
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/delay.h>
 #include <xen/event.h>
 #include <xen/time.h>
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 719e0f0d4f..367456e99e 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <xen/config.h>
 #include <xen/types.h>
+#include <xen/slab.h>
 #include <xen/string.h>
 
 #define BUG() do {					\
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 3c073f7d63..0462fda5c1 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -409,9 +409,6 @@ static inline void exec_domain_unblock(struct exec_domain *ed)
 
 #define VM_ASSIST(_d,_t) (test_bit((_t), &(_d)->vm_assist))
 
-#include <xen/slab.h>
-#include <xen/domain.h>
-
 #endif /* __SCHED_H__ */
 
 /*
diff --git a/xen/include/xen/slab.h b/xen/include/xen/slab.h
index a3a7daf7d6..4736dede90 100644
--- a/xen/include/xen/slab.h
+++ b/xen/include/xen/slab.h
@@ -2,9 +2,6 @@
 #ifndef __SLAB_H__
 #define __SLAB_H__
 
-#include <xen/config.h>
-#include <xen/mm.h>
-
 /* Allocate space for typed object. */
 #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))