bitkeeper revision 1.1159.212.100 (42050e5fWLAKCQAvoZ3CPmyAaL-51g)

Reorganise 'struct domain' and 'struct exec_domain' to each have an
architecture-specific portion. Removed 'mm_struct'.
Signed-off-by: keir.fraser@cl.cam.ac.uk

1 files changed, 9 insertions, 7 deletions

diff --git a/xen/include/asm-x86/ldt.h b/xen/include/asm-x86/ldt.h
index 84c456120c..d44d896de1 100644
--- a/xen/include/asm-x86/ldt.h
+++ b/xen/include/asm-x86/ldt.h
@@ -1,25 +1,27 @@
+/* -*-  Mode:C; c-basic-offset:4; tab-width:4; indent-tabs-mode:nil -*- */
+
 #ifndef __ARCH_LDT_H
 #define __ARCH_LDT_H
 
 #ifndef __ASSEMBLY__
 
-static inline void load_LDT(struct exec_domain *p)
+static inline void load_LDT(struct exec_domain *ed)
 {
     unsigned int cpu;
     struct desc_struct *desc;
     unsigned long ents;
-                                                                                                
-    if ( (ents = p->mm.ldt_ents) == 0 )
+
+    if ( (ents = ed->arch.ldt_ents) == 0 )
     {
         __asm__ __volatile__ ( "lldt %%ax" : : "a" (0) );
     }
     else
     {
         cpu = smp_processor_id();
-        desc = (struct desc_struct *)GET_GDT_ADDRESS(p) + __LDT(cpu);
-        desc->a = ((LDT_VIRT_START(p)&0xffff)<<16) | (ents*8-1);
-        desc->b = (LDT_VIRT_START(p)&(0xff<<24)) | 0x8200 |
-            ((LDT_VIRT_START(p)&0xff0000)>>16);
+        desc = (struct desc_struct *)GET_GDT_ADDRESS(ed) + __LDT(cpu);
+        desc->a = ((LDT_VIRT_START(ed)&0xffff)<<16) | (ents*8-1);
+        desc->b = (LDT_VIRT_START(ed)&(0xff<<24)) | 0x8200 |
+            ((LDT_VIRT_START(ed)&0xff0000)>>16);
         __asm__ __volatile__ ( "lldt %%ax" : : "a" (__LDT(cpu)<<3) );
     }
 }