vserver 1.9.3

[linux-2.6.git] / arch / x86_64 / mm / init.c

diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index f393e33..e13acb6 100644 (file)
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -41,6 +41,10 @@
 #define Dprintk(x...)
 #endif
 
+#ifdef CONFIG_GART_IOMMU
+extern int swiotlb;
+#endif
+
 extern char _stext[];
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
@@ -396,6 +400,8 @@ static inline int page_is_ram (unsigned long pagenr)
        return 0;
 }
 
+extern int swiotlb_force;
+
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
                         kcore_vsyscall;
 
@@ -405,7 +411,10 @@ void __init mem_init(void)
        int tmp;
 
 #ifdef CONFIG_SWIOTLB
-       if (!iommu_aperture && end_pfn >= 0xffffffff>>PAGE_SHIFT)
+       if (swiotlb_force)
+               swiotlb = 1;
+       if (!iommu_aperture &&
+           (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
               swiotlb = 1;
        if (swiotlb)
                swiotlb_init(); 
@@ -596,7 +605,16 @@ static struct vm_area_struct gate32_vma = {
 
 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
 {
-       return test_tsk_thread_flag(tsk, TIF_IA32) ? &gate32_vma : &gate_vma;
+#ifdef CONFIG_IA32_EMULATION
+       if (test_tsk_thread_flag(tsk, TIF_IA32)) {
+               /* lookup code assumes the pages are present. set them up
+                  now */
+               if (__map_syscall32(tsk->mm, 0xfffe000) < 0)
+                       return NULL;
+               return &gate32_vma;
+       }
+#endif
+       return &gate_vma;
 }
 
 int in_gate_area(struct task_struct *task, unsigned long addr)