ia64/xen-unstable

changeset 4480:47a052edfe9f

bitkeeper revision 1.1236.59.2 (4252b4a1UliXnMSbhPVlbuo8WZ0wBw)

Remove superfluous ARCH_HAS_EXEC_DOMAIN_MM_PTR
author djm@djmnc4000.(none)
date Tue Apr 05 15:54:09 2005 +0000 (2005-04-05)
parents 1081b873c010
children 835fa5f22345
files xen/arch/ia64/patch/linux-2.6.7/setup.c xen/arch/ia64/xensetup.c xen/include/xen/sched.h
line diff
     1.1 --- a/xen/arch/ia64/patch/linux-2.6.7/setup.c	Tue Apr 05 15:24:53 2005 +0000
     1.2 +++ b/xen/arch/ia64/patch/linux-2.6.7/setup.c	Tue Apr 05 15:54:09 2005 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  --- ../../linux-2.6.7/arch/ia64/kernel/setup.c	2004-06-15 23:18:58.000000000 -0600
     1.5 -+++ arch/ia64/setup.c	2005-03-23 14:54:06.000000000 -0700
     1.6 ++++ arch/ia64/setup.c	2005-04-04 22:31:09.000000000 -0600
     1.7  @@ -21,6 +21,9 @@
     1.8   #include <linux/init.h>
     1.9   
    1.10 @@ -180,7 +180,19 @@
    1.11   	seq_printf(m,
    1.12   		   "processor  : %d\n"
    1.13   		   "vendor     : %s\n"
    1.14 -@@ -667,6 +702,8 @@
    1.15 +@@ -616,7 +651,11 @@
    1.16 + 					| IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
    1.17 + 	atomic_inc(&init_mm.mm_count);
    1.18 + 	current->active_mm = &init_mm;
    1.19 ++#ifdef XEN
    1.20 ++	if (current->domain->arch.mm)
    1.21 ++#else
    1.22 + 	if (current->mm)
    1.23 ++#endif
    1.24 + 		BUG();
    1.25 + 
    1.26 + 	ia64_mmu_init(ia64_imva(cpu_data));
    1.27 +@@ -667,6 +706,8 @@
    1.28   void
    1.29   check_bugs (void)
    1.30   {
     2.1 --- a/xen/arch/ia64/xensetup.c	Tue Apr 05 15:24:53 2005 +0000
     2.2 +++ b/xen/arch/ia64/xensetup.c	Tue Apr 05 15:54:09 2005 +0000
     2.3 @@ -258,7 +258,8 @@ printk("About to call do_createdomain()\
     2.4  printk("About to call init_idle_task()\n");
     2.5      init_task.domain = &idle0_domain;
     2.6      init_task.processor = 0;
     2.7 -    init_task.mm = &init_mm;
     2.8 +//    init_task.mm = &init_mm;
     2.9 +    init_task.domain->arch.mm = &init_mm;
    2.10  //    init_task.thread = INIT_THREAD;
    2.11      init_idle_task();
    2.12      //arch_do_createdomain(current);
     3.1 --- a/xen/include/xen/sched.h	Tue Apr 05 15:24:53 2005 +0000
     3.2 +++ b/xen/include/xen/sched.h	Tue Apr 05 15:54:09 2005 +0000
     3.3 @@ -68,10 +68,6 @@ struct exec_domain
     3.4      struct exec_domain *ed_next_list;
     3.5      int eid;
     3.6  
     3.7 -#ifdef ARCH_HAS_EXEC_DOMAIN_MM_PTR
     3.8 -    struct mm_struct *mm;
     3.9 -#endif
    3.10 -
    3.11      struct ac_timer  timer;         /* one-shot timer for timeout values */
    3.12      unsigned long    sleep_tick;    /* tick at which this vcpu started sleep */
    3.13