ia64/xen-unstable

changeset 19147:d68178692b7c

ia64: fix compilation error

This patch fixes the following compilation error.
Since struct page_list_head is defined in mm.h, sched.h needs mm.h.
Other circular inclusions are sorted out.

> In file included from xen/include/asm-ia64/linux-xen/asm/smp.h:50,
> from xen/include/linux/smp.h:5,
> from xen/include/asm-ia64/linux/topology.h:33,
> from xen/include/asm-ia64/linux-xen/linux/gfp.h:6,
> from xen/include/asm/mm.h:11,
> from xen/include/xen/mm.h:90,
> from viosapic.c:35:
> xen/include/xen/sched.h:174: error: field page_list has incomplete
> type
> xen/include/xen/sched.h:175: error: field xenpage_list has
> incomplete type

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Feb 03 14:06:51 2009 +0000 (2009-02-03)
parents 2262fddac319
children aca402831ac1
files xen/drivers/passthrough/vtd/dmar.c xen/include/asm-ia64/hardirq.h xen/include/asm-ia64/linux-xen/asm/smp.h xen/include/asm-ia64/mm.h xen/include/asm-ia64/tlbflush.h xen/include/xen/sched.h
line diff
     1.1 --- a/xen/drivers/passthrough/vtd/dmar.c	Tue Feb 03 14:03:32 2009 +0000
     1.2 +++ b/xen/drivers/passthrough/vtd/dmar.c	Tue Feb 03 14:06:51 2009 +0000
     1.3 @@ -21,6 +21,7 @@
     1.4  
     1.5  #include <xen/init.h>
     1.6  #include <xen/bitmap.h>
     1.7 +#include <xen/errno.h>
     1.8  #include <xen/kernel.h>
     1.9  #include <xen/acpi.h>
    1.10  #include <xen/mm.h>
     2.1 --- a/xen/include/asm-ia64/hardirq.h	Tue Feb 03 14:03:32 2009 +0000
     2.2 +++ b/xen/include/asm-ia64/hardirq.h	Tue Feb 03 14:06:51 2009 +0000
     2.3 @@ -4,6 +4,7 @@
     2.4  #define __ARCH_IRQ_STAT	1
     2.5  #define HARDIRQ_BITS	14
     2.6  #include <linux/hardirq.h>
     2.7 +#include <xen/sched.h>
     2.8  
     2.9  #define local_softirq_pending()		(local_cpu_data->softirq_pending)
    2.10  
     3.1 --- a/xen/include/asm-ia64/linux-xen/asm/smp.h	Tue Feb 03 14:03:32 2009 +0000
     3.2 +++ b/xen/include/asm-ia64/linux-xen/asm/smp.h	Tue Feb 03 14:06:51 2009 +0000
     3.3 @@ -47,7 +47,6 @@ ia64_get_lid (void)
     3.4  #define SMP_IPI_REDIRECTION	(1 << 1)
     3.5  
     3.6  #ifdef XEN
     3.7 -#include <xen/sched.h>
     3.8  #define raw_smp_processor_id() (current->processor)
     3.9  #else
    3.10  #define raw_smp_processor_id() (current_thread_info()->cpu)
     4.1 --- a/xen/include/asm-ia64/mm.h	Tue Feb 03 14:03:32 2009 +0000
     4.2 +++ b/xen/include/asm-ia64/mm.h	Tue Feb 03 14:06:51 2009 +0000
     4.3 @@ -13,7 +13,6 @@
     4.4  #include <xen/list.h>
     4.5  #include <xen/spinlock.h>
     4.6  #include <xen/perfc.h>
     4.7 -#include <xen/sched.h>
     4.8  
     4.9  #include <asm/processor.h>
    4.10  #include <asm/atomic.h>
     5.1 --- a/xen/include/asm-ia64/tlbflush.h	Tue Feb 03 14:03:32 2009 +0000
     5.2 +++ b/xen/include/asm-ia64/tlbflush.h	Tue Feb 03 14:06:51 2009 +0000
     5.3 @@ -1,7 +1,8 @@
     5.4  #ifndef __FLUSHTLB_H__
     5.5  #define __FLUSHTLB_H__
     5.6  
     5.7 -#include <xen/sched.h>
     5.8 +struct vcpu;
     5.9 +struct domain;
    5.10  
    5.11  /* TLB flushes can be either local (current vcpu only) or domain wide (on
    5.12     all vcpus).
     6.1 --- a/xen/include/xen/sched.h	Tue Feb 03 14:03:32 2009 +0000
     6.2 +++ b/xen/include/xen/sched.h	Tue Feb 03 14:06:51 2009 +0000
     6.3 @@ -19,6 +19,7 @@
     6.4  #include <xen/xenoprof.h>
     6.5  #include <xen/rcupdate.h>
     6.6  #include <xen/irq.h>
     6.7 +#include <xen/mm.h>
     6.8  
     6.9  #ifdef CONFIG_COMPAT
    6.10  #include <compat/vcpu.h>