diff -ur common.orig/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c --- common.orig/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-14 01:29:11.000000000 -0500 +++ common/lib/modules/fglrx/build_mod/firegl_public.c 2006-12-14 01:26:37.000000000 -0500 @@ -23,6 +23,7 @@ // ============================================================ #include +#include #ifdef MODVERSIONS #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71) #include @@ -3156,13 +3157,13 @@ __KE_DEBUG(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ vma->vm_ops = &vm_ops; } break; case __KE_SHM: - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ vma->vm_ops = &vm_shm_ops; break; @@ -3171,26 +3172,26 @@ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; #if LINUX_VERSION_CODE <= 0x02040e /* KERNEL_VERSION(2,4,14) */ - vma->vm_flags |= VM_LOCKED | VM_SHM; /* Don't swap */ + vma->vm_flags |= VM_LOCKED; /* Don't swap */ #else vma->vm_flags |= VM_RESERVED; #endif - //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ + //vma->vm_flags |= VM_LOCKED; /* DDDDDDDDDDon't swap */ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_pcie_ops; break; case __KE_CTX: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_LOCKED | VM_RESERVED; /* Don't swap */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_ctx_ops; break; case __KE_PCI_BQS: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_LOCKED | VM_RESERVED; /* Don't swap */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_pci_bq_ops; break; @@ -3206,7 +3207,7 @@ * with sorting out the real physical pages and mappings * in our page fault handler */ - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ vma->vm_ops = &vm_cant_ops; } #else @@ -3222,7 +3223,7 @@ #ifdef __x86_64__ vma->vm_flags |= VM_RESERVED; #else - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ #endif vma->vm_ops = &vm_ops; } @@ -3238,7 +3239,7 @@ * with sorting out the real physical pages and mappings * in our page fault handler */ - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ vma->vm_ops = &vm_cant_agp_bq_ops; } // else @@ -3254,7 +3255,7 @@ #ifdef __x86_64__ vma->vm_flags |= VM_RESERVED; #else - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ + vma->vm_flags |= VM_RESERVED; /* Don't swap */ #endif vma->vm_ops = &vm_agp_bq_ops; } @@ -3263,7 +3264,7 @@ #endif /* __AGP__BUILTIN__ */ case __KE_KMAP: - vma->vm_flags |= VM_SHM | VM_RESERVED; + vma->vm_flags |= VM_RESERVED; vma->vm_ops = &vm_kmap_ops; if (readonly && (vma->vm_flags & VM_WRITE)) { diff -ur common.orig/lib/modules/fglrx/build_mod/make.sh common/lib/modules/fglrx/build_mod/make.sh --- common.orig/lib/modules/fglrx/build_mod/make.sh 2006-12-14 01:29:16.000000000 -0500 +++ common/lib/modules/fglrx/build_mod/make.sh 2006-12-14 01:27:11.000000000 -0500 @@ -205,7 +205,7 @@ # verify match with respective line in linux/version.h # sample: #define UTS_RELEASE "2.4.0-test7" -src_file=$linuxincludes/linux/version.h +src_file=$linuxincludes/linux/utsrelease.h if [ ! -e $src_file ]; then echo "kernel includes at $linuxincludes not found or incomplete" | tee -a $logfile