Mailing List Archive

From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Changes in v2:

- include asm header files after xen header files;

- remove incorrect comment;

- do not include asm/p2m.h under ia64.


Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---
xen/common/domctl.c | 1 +
xen/common/grant_table.c | 1 +
xen/common/irq.c | 1 +
xen/common/kernel.c | 2 +-
xen/common/keyhandler.c | 1 +
xen/common/memory.c | 4 ++--
xen/common/spinlock.c | 1 +
xen/common/wait.c | 1 +
xen/drivers/char/console.c | 1 +
xen/include/xen/grant_table.h | 1 +
xen/include/xen/list.h | 1 +
xen/include/xen/sched.h | 4 ++++
xen/include/xen/timer.h | 1 +
xen/include/xen/tmem_xen.h | 1 +
14 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 6705a57..397f774 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -24,6 +24,7 @@
#include <xen/paging.h>
#include <xen/hypercall.h>
#include <asm/current.h>
+#include <asm/page.h>
#include <public/domctl.h>
#include <xsm/xsm.h>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index c80a359..de3a076 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -38,6 +38,7 @@
#include <xen/paging.h>
#include <xen/keyhandler.h>
#include <xsm/xsm.h>
+#include <asm/flushtlb.h>

#ifndef max_nr_grant_frames
unsigned int max_nr_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES;
diff --git a/xen/common/irq.c b/xen/common/irq.c
index 6d37dd4..3e55dfa 100644
--- a/xen/common/irq.c
+++ b/xen/common/irq.c
@@ -1,5 +1,6 @@
#include <xen/config.h>
#include <xen/irq.h>
+#include <xen/errno.h>

int init_one_irq_desc(struct irq_desc *desc)
{
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 7decc1d..f51d387 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -18,8 +18,8 @@
#include <public/version.h>
#ifdef CONFIG_X86
#include <asm/shared.h>
-#include <asm/setup.h>
#endif
+#include <asm/setup.h>

#ifndef COMPAT

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index a8f256a..6071f09 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -15,6 +15,7 @@
#include <xen/compat.h>
#include <xen/ctype.h>
#include <xen/perfc.h>
+#include <xen/init.h>
#include <asm/debugger.h>
#include <asm/div64.h>

diff --git a/xen/common/memory.c b/xen/common/memory.c
index aefb706..52e2466 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -23,8 +23,8 @@
#include <xen/tmem_xen.h>
#include <asm/current.h>
#include <asm/hardirq.h>
-#ifdef CONFIG_X86
-# include <asm/p2m.h>
+#ifndef __ia64__
+#include <asm/p2m.h>
#endif
#include <xen/numa.h>
#include <public/memory.h>
diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index ecf5b44..bfb9670 100644
--- a/xen/common/spinlock.c
+++ b/xen/common/spinlock.c
@@ -8,6 +8,7 @@
#include <xen/preempt.h>
#include <public/sysctl.h>
#include <asm/processor.h>
+#include <asm/atomic.h>

#ifndef NDEBUG

diff --git a/xen/common/wait.c b/xen/common/wait.c
index a2c7640..0410c98 100644
--- a/xen/common/wait.c
+++ b/xen/common/wait.c
@@ -23,6 +23,7 @@
#include <xen/config.h>
#include <xen/sched.h>
#include <xen/wait.h>
+#include <xen/errno.h>

struct waitqueue_vcpu {
struct list_head list;
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 8a4c684..89cf4f8 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -12,6 +12,7 @@

#include <xen/version.h>
#include <xen/lib.h>
+#include <xen/init.h>
#include <xen/event.h>
#include <xen/console.h>
#include <xen/serial.h>
diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h
index c161705..cb0596a 100644
--- a/xen/include/xen/grant_table.h
+++ b/xen/include/xen/grant_table.h
@@ -26,6 +26,7 @@

#include <xen/config.h>
#include <public/grant_table.h>
+#include <asm/page.h>
#include <asm/grant_table.h>

/* Active grant entry - used for shadowing GTF_permit_access grants. */
diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h
index b87682f..18443a4 100644
--- a/xen/include/xen/list.h
+++ b/xen/include/xen/list.h
@@ -8,6 +8,7 @@
#define __XEN_LIST_H__

#include <xen/lib.h>
+#include <xen/prefetch.h>
#include <asm/system.h>

/* These are non-NULL pointers that will result in page faults
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index e12293c..832ca6f 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -14,6 +14,10 @@
#include <xen/nodemask.h>
#include <xen/radix-tree.h>
#include <xen/multicall.h>
+#include <xen/tasklet.h>
+#include <xen/mm.h>
+#include <xen/smp.h>
+#include <asm/atomic.h>
#include <public/xen.h>
#include <public/domctl.h>
#include <public/sysctl.h>
diff --git a/xen/include/xen/timer.h b/xen/include/xen/timer.h
index d209142..7c465fb 100644
--- a/xen/include/xen/timer.h
+++ b/xen/include/xen/timer.h
@@ -12,6 +12,7 @@
#include <xen/time.h>
#include <xen/string.h>
#include <xen/list.h>
+#include <xen/percpu.h>

struct timer {
/* System time expiry value (nanoseconds since boot). */
diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h
index 3dbf6f8..7ce9677 100644
--- a/xen/include/xen/tmem_xen.h
+++ b/xen/include/xen/tmem_xen.h
@@ -11,6 +11,7 @@

#include <xen/config.h>
#include <xen/mm.h> /* heap alloc/free */
+#include <xen/pfn.h>
#include <xen/xmalloc.h> /* xmalloc/xfree */
#include <xen/sched.h> /* struct domain */
#include <xen/guest_access.h> /* copy_from_guest */
--
1.7.2.5


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