ChangeSet 1.1236.59.2, 2005/04/05 09:54:09-06:00, djm@djmnc4000.(none)
Remove superfluous ARCH_HAS_EXEC_DOMAIN_MM_PTR
arch/ia64/patch/linux-2.6.7/setup.c | 11 +++++++++--
arch/ia64/xensetup.c | 3 ++-
include/xen/sched.h | 4 ----
3 files changed, 11 insertions(+), 7 deletions(-)
diff -Nru a/xen/arch/ia64/patch/linux-2.6.7/setup.c
b/xen/arch/ia64/patch/linux-2.6.7/setup.c
--- a/xen/arch/ia64/patch/linux-2.6.7/setup.c 2005-04-06 09:03:09 -04:00
+++ b/xen/arch/ia64/patch/linux-2.6.7/setup.c 2005-04-06 09:03:09 -04:00
@@ -1,5 +1,5 @@
--- ../../linux-2.6.7/arch/ia64/kernel/setup.c 2004-06-15 23:18:58.000000000
-0600
-+++ arch/ia64/setup.c 2005-03-23 14:54:06.000000000 -0700
++++ arch/ia64/setup.c 2005-04-04 22:31:09.000000000 -0600
@@ -21,6 +21,9 @@
#include <linux/init.h>
@@ -180,7 +180,19 @@
seq_printf(m,
"processor : %d\n"
"vendor : %s\n"
-@@ -667,6 +702,8 @@
+@@ -616,7 +651,11 @@
+ | IA64_DCR_DA | IA64_DCR_DD |
IA64_DCR_LC));
+ atomic_inc(&init_mm.mm_count);
+ current->active_mm = &init_mm;
++#ifdef XEN
++ if (current->domain->arch.mm)
++#else
+ if (current->mm)
++#endif
+ BUG();
+
+ ia64_mmu_init(ia64_imva(cpu_data));
+@@ -667,6 +706,8 @@
void
check_bugs (void)
{
diff -Nru a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c 2005-04-06 09:03:09 -04:00
+++ b/xen/arch/ia64/xensetup.c 2005-04-06 09:03:09 -04:00
@@ -258,7 +258,8 @@
printk("About to call init_idle_task()\n");
init_task.domain = &idle0_domain;
init_task.processor = 0;
- init_task.mm = &init_mm;
+// init_task.mm = &init_mm;
+ init_task.domain->arch.mm = &init_mm;
// init_task.thread = INIT_THREAD;
init_idle_task();
//arch_do_createdomain(current);
diff -Nru a/xen/include/xen/sched.h b/xen/include/xen/sched.h
--- a/xen/include/xen/sched.h 2005-04-06 09:03:09 -04:00
+++ b/xen/include/xen/sched.h 2005-04-06 09:03:09 -04:00
@@ -68,10 +68,6 @@
struct exec_domain *ed_next_list;
int eid;
-#ifdef ARCH_HAS_EXEC_DOMAIN_MM_PTR
- struct mm_struct *mm;
-#endif
-
struct ac_timer timer; /* one-shot timer for timeout values */
unsigned long sleep_tick; /* tick at which this vcpu started sleep */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home