ia64/xen-unstable

changeset 3674:8f28d947becc

bitkeeper revision 1.1159.246.3 (4204e7ad2KYRVbyWiC88XmVkIag9Wg)

More common-code movements for ia64.
Signed-off-by: keir.fraser@cl.cam.ac.uk
author kaf24@scramble.cl.cam.ac.uk
date Sat Feb 05 15:35:09 2005 +0000 (2005-02-05)
parents d8970d36fc08
children 32959ed5fef3
files .rootkeys xen/include/asm-x86/domain.h xen/include/asm-x86/init.h xen/include/xen/init.h xen/include/xen/sched.h
line diff
     1.1 --- a/.rootkeys	Sat Feb 05 12:52:28 2005 +0000
     1.2 +++ b/.rootkeys	Sat Feb 05 15:35:09 2005 +0000
     1.3 @@ -999,12 +999,14 @@ 3ddb79c2jFkPAZTDmU35L6IUssYMgQ xen/inclu
     1.4  3ddb79c3r9-31dIsewPV3P3i8HALsQ xen/include/asm-x86/delay.h
     1.5  3ddb79c34BFiXjBJ_cCKB0aCsV1IDw xen/include/asm-x86/desc.h
     1.6  40715b2dTokMLYGSuD58BnxOqyWVew xen/include/asm-x86/div64.h
     1.7 +4204e7acwzqgXyTAPKa1nM-L7Ec0Qw xen/include/asm-x86/domain.h
     1.8  41febc4bBKTKHhnAu_KPYwgNkHjFlg xen/include/asm-x86/domain_page.h
     1.9  41d3eaaeIBzW621S1oa0c2yk7X43qQ xen/include/asm-x86/e820.h
    1.10  3ddb79c3NU8Zy40OTrq3D-i30Y3t4A xen/include/asm-x86/fixmap.h
    1.11  3e2d29944GI24gf7vOP_7x8EyuqxeA xen/include/asm-x86/flushtlb.h
    1.12  3ddb79c39o75zPP0T1aQQ4mNrCAN2w xen/include/asm-x86/hardirq.h
    1.13  3ddb79c3TMDjkxVndKFKnGiwY0HzDg xen/include/asm-x86/i387.h
    1.14 +4204e7acwXDo-5iAAiO2eQbtDeYZXA xen/include/asm-x86/init.h
    1.15  3ddb79c3fQ_O3o5NHK2N8AJdk0Ea4Q xen/include/asm-x86/io.h
    1.16  3ddb79c2TKeScYHQZreTdHqYNLbehQ xen/include/asm-x86/io_apic.h
    1.17  3ddb79c2L7rTlFzazOLW1XuSZefpFw xen/include/asm-x86/irq.h
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/include/asm-x86/domain.h	Sat Feb 05 15:35:09 2005 +0000
     2.3 @@ -0,0 +1,11 @@
     2.4 +
     2.5 +#ifndef __X86_DOMAIN_H__
     2.6 +#define __X86_DOMAIN_H__
     2.7 +
     2.8 +typedef struct {
     2.9 +} arch_domain_t;
    2.10 +
    2.11 +typedef struct {
    2.12 +} arch_exec_domain_t;
    2.13 +
    2.14 +#endif /* __X86_DOMAIN_H__ */
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/xen/include/asm-x86/init.h	Sat Feb 05 15:35:09 2005 +0000
     3.3 @@ -0,0 +1,29 @@
     3.4 +#ifndef _XEN_ASM_INIT_H
     3.5 +#define _XEN_ASM_INIT_H
     3.6 +
     3.7 +/*
     3.8 + * Mark functions and data as being only used at initialization
     3.9 + * or exit time.
    3.10 + */
    3.11 +#define __init       \
    3.12 +    __attribute__ ((__section__ (".init.text")))
    3.13 +#define __exit       \
    3.14 +    __attribute_used__ __attribute__ ((__section__(".text.exit")))
    3.15 +#define __initdata   \
    3.16 +    __attribute__ ((__section__ (".init.data")))
    3.17 +#define __exitdata   \
    3.18 +    __attribute_used__ __attribute__ ((__section__ (".data.exit")))
    3.19 +#define __initsetup  \
    3.20 +    __attribute_used__ __attribute__ ((__section__ (".setup.init")))
    3.21 +#define __init_call  \
    3.22 +    __attribute_used__ __attribute__ ((__section__ (".initcall.init")))
    3.23 +#define __exit_call  \
    3.24 +    __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
    3.25 +
    3.26 +/* For assembly routines
    3.27 +#define __INIT		.section	".text.init","ax"
    3.28 +#define __FINIT		.previous
    3.29 +#define __INITDATA	.section	".data.init","aw"
    3.30 +*/
    3.31 +
    3.32 +#endif /* _XEN_ASM_INIT_H */
     4.1 --- a/xen/include/xen/init.h	Sat Feb 05 12:52:28 2005 +0000
     4.2 +++ b/xen/include/xen/init.h	Sat Feb 05 15:35:09 2005 +0000
     4.3 @@ -2,6 +2,7 @@
     4.4  #define _LINUX_INIT_H
     4.5  
     4.6  #include <xen/config.h>
     4.7 +#include <asm/init.h>
     4.8  
     4.9  /* These macros are used to mark some functions or 
    4.10   * initialized data (doesn't apply to uninitialized data)
    4.11 @@ -83,30 +84,6 @@ extern struct kernel_param __setup_start
    4.12      
    4.13  #endif /* __ASSEMBLY__ */
    4.14  
    4.15 -/*
    4.16 - * Mark functions and data as being only used at initialization
    4.17 - * or exit time.
    4.18 - */
    4.19 -#define __init       \
    4.20 -    __attribute__ ((__section__ (".text.init")))
    4.21 -#define __exit       \
    4.22 -    __attribute_used__ __attribute__ ((__section__(".text.exit")))
    4.23 -#define __initdata   \
    4.24 -    __attribute__ ((__section__ (".data.init")))
    4.25 -#define __exitdata   \
    4.26 -    __attribute_used__ __attribute__ ((__section__ (".data.exit")))
    4.27 -#define __initsetup  \
    4.28 -    __attribute_used__ __attribute__ ((__section__ (".setup.init")))
    4.29 -#define __init_call  \
    4.30 -    __attribute_used__ __attribute__ ((__section__ (".initcall.init")))
    4.31 -#define __exit_call  \
    4.32 -    __attribute_used__ __attribute__ ((__section__ (".exitcall.exit")))
    4.33 -
    4.34 -/* For assembly routines */
    4.35 -#define __INIT		.section	".text.init","ax"
    4.36 -#define __FINIT		.previous
    4.37 -#define __INITDATA	.section	".data.init","aw"
    4.38 -
    4.39  #ifdef CONFIG_HOTPLUG
    4.40  #define __devinit
    4.41  #define __devinitdata
     5.1 --- a/xen/include/xen/sched.h	Sat Feb 05 12:52:28 2005 +0000
     5.2 +++ b/xen/include/xen/sched.h	Sat Feb 05 15:35:09 2005 +0000
     5.3 @@ -21,7 +21,8 @@
     5.4  #include <asm/current.h>
     5.5  #include <xen/spinlock.h>
     5.6  #include <xen/grant_table.h>
     5.7 -#include <xen/irq_cpustat.h>
     5.8 +#include <asm/hardirq.h>
     5.9 +#include <asm/domain.h>
    5.10  
    5.11  extern unsigned long volatile jiffies;
    5.12  extern rwlock_t domlist_lock;
    5.13 @@ -67,7 +68,11 @@ struct exec_domain
    5.14      struct exec_domain *ed_next_list;
    5.15      int eid;
    5.16  
    5.17 +#ifdef ARCH_HAS_EXEC_DOMAIN_MM_PTR
    5.18 +    struct mm_struct *mm;
    5.19 +#else
    5.20      struct mm_struct mm;
    5.21 +#endif
    5.22  
    5.23      struct thread_struct thread;
    5.24  
    5.25 @@ -84,6 +89,7 @@ struct exec_domain
    5.26      u16 virq_to_evtchn[NR_VIRQS];
    5.27  
    5.28      atomic_t pausecnt;
    5.29 +    arch_exec_domain_t arch;
    5.30  
    5.31  };
    5.32  
    5.33 @@ -151,6 +157,7 @@ struct domain {
    5.34      atomic_t refcnt;
    5.35  
    5.36      struct exec_domain *exec_domain[MAX_VIRT_CPUS];
    5.37 +    arch_domain_t arch;
    5.38  };
    5.39  
    5.40  struct domain_setup_info
    5.41 @@ -373,4 +380,5 @@ static inline void domain_unpause_by_sys
    5.42  #include <xen/slab.h>
    5.43  #include <xen/domain.h>
    5.44  
    5.45 +
    5.46  #endif /* __SCHED_H__ */