ia64/xen-unstable

changeset 4839:a5b33d336f17

bitkeeper revision 1.1389.15.6 (4281359ejSQPcJ7qoKDaeTFt7zBKUg)

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@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue May 10 22:28:46 2005 +0000 (2005-05-10)
parents 9143c15ed7c3
children f71cef640151
files xen/common/page_alloc.c xen/common/schedule.c xen/drivers/char/console.c xen/include/asm-x86/shadow.h xen/include/xen/cpumask.h xen/include/xen/slab.h
line diff
     1.1 --- a/xen/common/page_alloc.c	Tue May 10 16:45:22 2005 +0000
     1.2 +++ b/xen/common/page_alloc.c	Tue May 10 22:28:46 2005 +0000
     1.3 @@ -28,6 +28,7 @@
     1.4  #include <xen/sched.h>
     1.5  #include <xen/spinlock.h>
     1.6  #include <xen/slab.h>
     1.7 +#include <xen/mm.h>
     1.8  #include <xen/irq.h>
     1.9  #include <xen/softirq.h>
    1.10  #include <xen/shadow.h>
     2.1 --- a/xen/common/schedule.c	Tue May 10 16:45:22 2005 +0000
     2.2 +++ b/xen/common/schedule.c	Tue May 10 22:28:46 2005 +0000
     2.3 @@ -34,6 +34,7 @@
     2.4  #include <xen/sched-if.h>
     2.5  #include <xen/softirq.h>
     2.6  #include <xen/trace.h>
     2.7 +#include <xen/mm.h>
     2.8  #include <public/sched_ctl.h>
     2.9  
    2.10  /* opt_sched: scheduler - default to Borrowed Virtual Time */
     3.1 --- a/xen/drivers/char/console.c	Tue May 10 16:45:22 2005 +0000
     3.2 +++ b/xen/drivers/char/console.c	Tue May 10 22:28:46 2005 +0000
     3.3 @@ -17,8 +17,8 @@
     3.4  #include <xen/console.h>
     3.5  #include <xen/serial.h>
     3.6  #include <xen/keyhandler.h>
     3.7 +#include <xen/mm.h>
     3.8  #include <asm/uaccess.h>
     3.9 -#include <asm/mm.h>
    3.10  #include <asm/debugger.h>
    3.11  #include <asm/io.h>
    3.12  
     4.1 --- a/xen/include/asm-x86/shadow.h	Tue May 10 16:45:22 2005 +0000
     4.2 +++ b/xen/include/asm-x86/shadow.h	Tue May 10 22:28:46 2005 +0000
     4.3 @@ -26,6 +26,7 @@
     4.4  #include <xen/types.h>
     4.5  #include <xen/perfc.h>
     4.6  #include <xen/sched.h>
     4.7 +#include <xen/mm.h>
     4.8  #include <asm/processor.h>
     4.9  #include <asm/domain_page.h>
    4.10  #include <public/dom0_ops.h>
     5.1 --- a/xen/include/xen/cpumask.h	Tue May 10 16:45:22 2005 +0000
     5.2 +++ b/xen/include/xen/cpumask.h	Tue May 10 22:28:46 2005 +0000
     5.3 @@ -9,7 +9,9 @@
     5.4  
     5.5  typedef u32 cpumask_t;
     5.6  
     5.7 +#ifndef cpu_online_map
     5.8  extern cpumask_t cpu_online_map;
     5.9 +#endif
    5.10  
    5.11  static inline int cpus_weight(cpumask_t w)
    5.12  {
     6.1 --- a/xen/include/xen/slab.h	Tue May 10 16:45:22 2005 +0000
     6.2 +++ b/xen/include/xen/slab.h	Tue May 10 22:28:46 2005 +0000
     6.3 @@ -3,12 +3,7 @@
     6.4  #define __SLAB_H__
     6.5  
     6.6  #include <xen/config.h>
     6.7 -
     6.8 -#ifdef __ARCH_HAS_SLAB_ALLOCATOR
     6.9 -
    6.10 -#include <asm/slab.h>
    6.11 -
    6.12 -#else
    6.13 +#include <xen/mm.h>
    6.14  
    6.15  /* Allocate space for typed object. */
    6.16  #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
    6.17 @@ -32,6 +27,4 @@ static inline void *_xmalloc_array(size_
    6.18   	return _xmalloc(size * num, align);
    6.19  }
    6.20  
    6.21 -#endif /* __ARCH_HAS_SLAB_ALLOCATOR */
    6.22 -
    6.23  #endif /* __SLAB_H__ */