ia64/xen-unstable

changeset 5285:a480b2990961

bitkeeper revision 1.1649 (429f6bb65KQm70mnFwO33ykh9n1qag)

sched.h:
g/c unneeded include.
Many files:
Rename xen/slab.h to xen/xmalloc.h and fix resulting fallout.
xmalloc.h:
Rename: xen/include/xen/slab.h -> xen/include/xen/xmalloc.h
sched.h, multicall.c, dom_mem_ops.c, asm-offsets.c:
cleanup incorrect includes.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Jun 02 20:27:34 2005 +0000 (2005-06-02)
parents 61942334e30c
children c439bfa3a4ce
files .rootkeys xen/arch/x86/dmi_scan.c xen/arch/x86/io_apic.c xen/arch/x86/microcode.c xen/arch/x86/mtrr/generic.c xen/arch/x86/x86_32/asm-offsets.c xen/arch/x86/x86_64/asm-offsets.c xen/common/dom_mem_ops.c xen/common/multicall.c xen/common/page_alloc.c xen/common/sched_bvt.c xen/common/sched_sedf.c xen/common/trace.c xen/include/xen/lib.h xen/include/xen/sched.h xen/include/xen/slab.h xen/include/xen/xmalloc.h
line diff
     1.1 --- a/.rootkeys	Thu Jun 02 20:04:57 2005 +0000
     1.2 +++ b/.rootkeys	Thu Jun 02 20:27:34 2005 +0000
     1.3 @@ -1445,7 +1445,6 @@ 40589969nPq3DMzv24RDb5LXE9brHw xen/inclu
     1.4  3ddb79c0LzqqS0LhAQ50ekgj4oGl7Q xen/include/xen/sched.h
     1.5  403a06a7H0hpHcKpAiDe5BPnaXWTlA xen/include/xen/serial.h
     1.6  4252c315hw0xXYMKIfFzhomi1M1yNA xen/include/xen/shadow.h
     1.7 -3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/slab.h
     1.8  3ddb79c09xbS-xxfKxuV3JETIhBzmg xen/include/xen/smp.h
     1.9  3ddb79c1Vi5VleJAOKHAlY0G2zAsgw xen/include/xen/softirq.h
    1.10  3ddb79c2iIcESrDAB8samy_yAh6olQ xen/include/xen/spinlock.h
    1.11 @@ -1453,6 +1452,7 @@ 3e7f358aMtFMUVvN_Zjg5qvEJIqEBA xen/inclu
    1.12  3ddb79c0BnA20PbgmuMPSGIBljNRQw xen/include/xen/time.h
    1.13  403a3edbG9K5uZjuY19_LORbQGmFbA xen/include/xen/trace.h
    1.14  3ddb79c1-kVvF8cVa0k3ZHDdBMj01Q xen/include/xen/types.h
    1.15 +3ddb79c14dXIhP7C2ahnoD08K90G_w xen/include/xen/xmalloc.h
    1.16  41d291f5u3J3HYViXLs3cNuFGTvzNg xen/tools/Makefile
    1.17  3eb3c87fc79FXLA6R9TvdBJNTvQDwA xen/tools/figlet/LICENSE
    1.18  3eb3c87fPL2T_zBb0bHlbZY-ACEKRw xen/tools/figlet/Makefile
     2.1 --- a/xen/arch/x86/dmi_scan.c	Thu Jun 02 20:04:57 2005 +0000
     2.2 +++ b/xen/arch/x86/dmi_scan.c	Thu Jun 02 20:27:34 2005 +0000
     2.3 @@ -1,10 +1,10 @@
     2.4  #include <xen/config.h>
     2.5  #include <xen/types.h>
     2.6 +#include <xen/lib.h>
     2.7  #include <xen/kernel.h>
     2.8  #include <xen/string.h>
     2.9  #include <xen/init.h>
    2.10  #include <xen/cache.h>
    2.11 -#include <xen/slab.h>
    2.12  #include <xen/acpi.h>
    2.13  #include <asm/io.h>
    2.14  #include <asm/system.h>
     3.1 --- a/xen/arch/x86/io_apic.c	Thu Jun 02 20:04:57 2005 +0000
     3.2 +++ b/xen/arch/x86/io_apic.c	Thu Jun 02 20:27:34 2005 +0000
     3.3 @@ -21,6 +21,7 @@
     3.4   */
     3.5  
     3.6  #include <xen/config.h>
     3.7 +#include <xen/lib.h>
     3.8  #include <xen/init.h>
     3.9  #include <xen/irq.h>
    3.10  #include <xen/delay.h>
    3.11 @@ -234,7 +235,7 @@ static void set_ioapic_affinity_irq(unsi
    3.12  #if defined(CONFIG_IRQBALANCE)
    3.13  # include <asm/processor.h>	/* kernel_thread() */
    3.14  # include <xen/kernel_stat.h>	/* kstat */
    3.15 -# include <xen/slab.h>		/* kmalloc() */
    3.16 +# include <xen/xmalloc.h>	/* kmalloc() */
    3.17  # include <xen/timer.h>	/* time_after() */
    3.18   
    3.19  # ifdef CONFIG_BALANCED_IRQ_DEBUG
     4.1 --- a/xen/arch/x86/microcode.c	Thu Jun 02 20:04:57 2005 +0000
     4.2 +++ b/xen/arch/x86/microcode.c	Thu Jun 02 20:27:34 2005 +0000
     4.3 @@ -70,10 +70,10 @@
     4.4   */
     4.5  
     4.6  #include <xen/config.h>
     4.7 +#include <xen/lib.h>
     4.8  #include <xen/kernel.h>
     4.9  #include <xen/init.h>
    4.10  #include <xen/sched.h>
    4.11 -#include <xen/slab.h>
    4.12  #include <xen/spinlock.h>
    4.13  
    4.14  #include <asm/msr.h>
     5.1 --- a/xen/arch/x86/mtrr/generic.c	Thu Jun 02 20:04:57 2005 +0000
     5.2 +++ b/xen/arch/x86/mtrr/generic.c	Thu Jun 02 20:27:34 2005 +0000
     5.3 @@ -1,8 +1,8 @@
     5.4  /* This only handles 32bit MTRR on 32bit hosts. This is strictly wrong
     5.5     because MTRRs can span upto 40 bits (36bits on most modern x86) */ 
     5.6 +#include <xen/lib.h>
     5.7  #include <xen/init.h>
     5.8  #include <xen/mm.h>
     5.9 -#include <xen/slab.h>
    5.10  #include <asm/flushtlb.h>
    5.11  #include <asm/io.h>
    5.12  #include <asm/mtrr.h>
     6.1 --- a/xen/arch/x86/x86_32/asm-offsets.c	Thu Jun 02 20:04:57 2005 +0000
     6.2 +++ b/xen/arch/x86/x86_32/asm-offsets.c	Thu Jun 02 20:27:34 2005 +0000
     6.3 @@ -7,6 +7,7 @@
     6.4  #include <xen/config.h>
     6.5  #include <xen/perfc.h>
     6.6  #include <xen/sched.h>
     6.7 +#include <asm/hardirq.h>
     6.8  
     6.9  #define DEFINE(_sym, _val) \
    6.10      __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )
     7.1 --- a/xen/arch/x86/x86_64/asm-offsets.c	Thu Jun 02 20:04:57 2005 +0000
     7.2 +++ b/xen/arch/x86/x86_64/asm-offsets.c	Thu Jun 02 20:27:34 2005 +0000
     7.3 @@ -7,6 +7,7 @@
     7.4  #include <xen/config.h>
     7.5  #include <xen/perfc.h>
     7.6  #include <xen/sched.h>
     7.7 +#include <asm/hardirq.h>
     7.8  
     7.9  #define DEFINE(_sym, _val) \
    7.10      __asm__ __volatile__ ( "\n->" #_sym " %0 " #_val : : "i" (_val) )
     8.1 --- a/xen/common/dom_mem_ops.c	Thu Jun 02 20:04:57 2005 +0000
     8.2 +++ b/xen/common/dom_mem_ops.c	Thu Jun 02 20:27:34 2005 +0000
     8.3 @@ -15,6 +15,7 @@
     8.4  #include <xen/event.h>
     8.5  #include <xen/shadow.h>
     8.6  #include <asm/domain_page.h>
     8.7 +#include <asm/hardirq.h>
     8.8  
     8.9  /*
    8.10   * To allow safe resume of do_dom_mem_op() after preemption, we need to know 
     9.1 --- a/xen/common/multicall.c	Thu Jun 02 20:04:57 2005 +0000
     9.2 +++ b/xen/common/multicall.c	Thu Jun 02 20:27:34 2005 +0000
     9.3 @@ -10,6 +10,7 @@
     9.4  #include <xen/sched.h>
     9.5  #include <xen/event.h>
     9.6  #include <xen/multicall.h>
     9.7 +#include <asm/hardirq.h>
     9.8  
     9.9  struct mc_state mc_state[NR_CPUS];
    9.10  
    10.1 --- a/xen/common/page_alloc.c	Thu Jun 02 20:04:57 2005 +0000
    10.2 +++ b/xen/common/page_alloc.c	Thu Jun 02 20:27:34 2005 +0000
    10.3 @@ -27,7 +27,6 @@
    10.4  #include <xen/perfc.h>
    10.5  #include <xen/sched.h>
    10.6  #include <xen/spinlock.h>
    10.7 -#include <xen/slab.h>
    10.8  #include <xen/mm.h>
    10.9  #include <xen/irq.h>
   10.10  #include <xen/softirq.h>
    11.1 --- a/xen/common/sched_bvt.c	Thu Jun 02 20:04:57 2005 +0000
    11.2 +++ b/xen/common/sched_bvt.c	Thu Jun 02 20:27:34 2005 +0000
    11.3 @@ -23,7 +23,6 @@
    11.4  #include <xen/ac_timer.h>
    11.5  #include <xen/perfc.h>
    11.6  #include <xen/sched-if.h>
    11.7 -#include <xen/slab.h>
    11.8  #include <xen/softirq.h>
    11.9  
   11.10  /* all per-domain BVT-specific scheduling info is stored here */
    12.1 --- a/xen/common/sched_sedf.c	Thu Jun 02 20:04:57 2005 +0000
    12.2 +++ b/xen/common/sched_sedf.c	Thu Jun 02 20:27:34 2005 +0000
    12.3 @@ -5,13 +5,13 @@
    12.4   * based on code by Mark Williamson (C) 2004 Intel Research Cambridge
    12.5   */
    12.6  
    12.7 +#include <xen/lib.h>
    12.8  #include <xen/sched.h>
    12.9  #include <xen/sched-if.h>
   12.10  #include <public/sched_ctl.h>
   12.11  #include <xen/ac_timer.h>
   12.12  #include <xen/softirq.h>
   12.13  #include <xen/time.h>
   12.14 -#include <xen/slab.h>
   12.15  
   12.16  /*verbosity settings*/
   12.17  #define SEDFLEVEL 0
    13.1 --- a/xen/common/trace.c	Thu Jun 02 20:04:57 2005 +0000
    13.2 +++ b/xen/common/trace.c	Thu Jun 02 20:27:34 2005 +0000
    13.3 @@ -23,7 +23,6 @@
    13.4  #include <asm/io.h>
    13.5  #include <xen/lib.h>
    13.6  #include <xen/sched.h>
    13.7 -#include <xen/slab.h>
    13.8  #include <xen/smp.h>
    13.9  #include <xen/trace.h>
   13.10  #include <xen/errno.h>
    14.1 --- a/xen/include/xen/lib.h	Thu Jun 02 20:04:57 2005 +0000
    14.2 +++ b/xen/include/xen/lib.h	Thu Jun 02 20:27:34 2005 +0000
    14.3 @@ -5,7 +5,7 @@
    14.4  #include <stdarg.h>
    14.5  #include <xen/config.h>
    14.6  #include <xen/types.h>
    14.7 -#include <xen/slab.h>
    14.8 +#include <xen/xmalloc.h>
    14.9  #include <xen/string.h>
   14.10  
   14.11  #define BUG() do {					\
    15.1 --- a/xen/include/xen/sched.h	Thu Jun 02 20:04:57 2005 +0000
    15.2 +++ b/xen/include/xen/sched.h	Thu Jun 02 20:27:34 2005 +0000
    15.3 @@ -7,21 +7,15 @@
    15.4  #include <xen/spinlock.h>
    15.5  #include <xen/cache.h>
    15.6  #include <xen/smp.h>
    15.7 -#include <asm/page.h>
    15.8 -#include <asm/processor.h>
    15.9  #include <public/xen.h>
   15.10  #include <public/dom0_ops.h>
   15.11  #include <xen/list.h>
   15.12  #include <xen/time.h>
   15.13  #include <xen/ac_timer.h>
   15.14  #include <xen/delay.h>
   15.15 -#include <asm/atomic.h>
   15.16 -#include <asm/current.h>
   15.17  #include <xen/spinlock.h>
   15.18  #include <xen/grant_table.h>
   15.19 -#include <asm/hardirq.h>
   15.20  #include <asm/domain.h>
   15.21 -#include <asm/bitops.h>
   15.22  
   15.23  extern unsigned long volatile jiffies;
   15.24  extern rwlock_t domlist_lock;
    16.1 --- a/xen/include/xen/slab.h	Thu Jun 02 20:04:57 2005 +0000
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,27 +0,0 @@
    16.4 -
    16.5 -#ifndef __SLAB_H__
    16.6 -#define __SLAB_H__
    16.7 -
    16.8 -/* Allocate space for typed object. */
    16.9 -#define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
   16.10 -
   16.11 -/* Allocate space for array of typed objects. */
   16.12 -#define xmalloc_array(_type, _num) ((_type *)_xmalloc_array(sizeof(_type), __alignof__(_type), _num))
   16.13 -
   16.14 -/* Allocate untyped storage. */
   16.15 -#define xmalloc_bytes(_bytes) (_xmalloc(_bytes, SMP_CACHE_BYTES))
   16.16 -
   16.17 -/* Free any of the above. */
   16.18 -extern void xfree(const void *);
   16.19 -
   16.20 -/* Underlying functions */
   16.21 -extern void *_xmalloc(size_t size, size_t align);
   16.22 -static inline void *_xmalloc_array(size_t size, size_t align, size_t num)
   16.23 -{
   16.24 -	/* Check for overflow. */
   16.25 -	if (size && num > UINT_MAX / size)
   16.26 -		return NULL;
   16.27 - 	return _xmalloc(size * num, align);
   16.28 -}
   16.29 -
   16.30 -#endif /* __SLAB_H__ */
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/xen/include/xen/xmalloc.h	Thu Jun 02 20:27:34 2005 +0000
    17.3 @@ -0,0 +1,27 @@
    17.4 +
    17.5 +#ifndef __XMALLOC_H__
    17.6 +#define __XMALLOC_H__
    17.7 +
    17.8 +/* Allocate space for typed object. */
    17.9 +#define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
   17.10 +
   17.11 +/* Allocate space for array of typed objects. */
   17.12 +#define xmalloc_array(_type, _num) ((_type *)_xmalloc_array(sizeof(_type), __alignof__(_type), _num))
   17.13 +
   17.14 +/* Allocate untyped storage. */
   17.15 +#define xmalloc_bytes(_bytes) (_xmalloc(_bytes, SMP_CACHE_BYTES))
   17.16 +
   17.17 +/* Free any of the above. */
   17.18 +extern void xfree(const void *);
   17.19 +
   17.20 +/* Underlying functions */
   17.21 +extern void *_xmalloc(size_t size, size_t align);
   17.22 +static inline void *_xmalloc_array(size_t size, size_t align, size_t num)
   17.23 +{
   17.24 +	/* Check for overflow. */
   17.25 +	if (size && num > UINT_MAX / size)
   17.26 +		return NULL;
   17.27 + 	return _xmalloc(size * num, align);
   17.28 +}
   17.29 +
   17.30 +#endif /* __XMALLOC_H__ */