Attachment #333386 for bug #448656

View | Details | Raw Unified | Return to bug 448656
Collapse All | Expand All




                KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                return -EAGAIN;
            }
            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
            vma->vm_ops = &vm_ops;
			break;


                KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
                return -EAGAIN;
            }
            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
            vma->vm_ops = &vm_ops;
            }
			break;
#endif                    

        case __KE_SHM:
            vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
            vma->vm_ops = &vm_shm_ops;
            break;



            pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;

            vma->vm_flags |= VM_IO;

            //vma->vm_flags |=  VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
            //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */


        case __KE_CTX:
            pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_IO; /* 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_IO; /* Don't swap */
            vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
            vma->vm_ops = &vm_pci_bq_ops;
            break;

                    return -EAGAIN;
                }
#ifdef __x86_64__
                vma->vm_flags |= VM_IO;
#else
                vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
#endif
                vma->vm_ops = &vm_ops;
            }

                    return -EAGAIN;
                }
#ifdef __x86_64__
                vma->vm_flags |= VM_IO;
#else
                vma->vm_flags |= VM_SHM | VM_IO; /* Don't swap */
#endif
                vma->vm_ops = &vm_agp_bq_ops;
            }

#endif /* __AGP__BUILTIN__ */

        case __KE_KMAP:
		    vma->vm_flags |= VM_SHM | VM_IO;
            vma->vm_ops = &vm_kmap_ops;
            if (readonly && (vma->vm_flags & VM_WRITE))
            {

#endif            
            // fall through
         case __KE_GART_CACHEABLE:
             vma->vm_flags |= VM_IO;
             vma->vm_ops = &vm_gart_ops;
             break;
        default:

Return to bug 448656

Lines 3710-3716 Link Here

(-)common/lib/modules/fglrx/build_mod/firegl_public.c.ORIG (-12 / +12 lines)
3710	KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");	3710	KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
3711	return -EAGAIN;	3711	return -EAGAIN;
3712	}	3712	}
3713	vma->vm_flags \|= VM_SHM \| VM_RESERVED; /* Don't swap */	3713	vma->vm_flags \|= VM_SHM \| VM_IO; /* Don't swap */
3714	vma->vm_ops = &vm_ops;	3714	vma->vm_ops = &vm_ops;
3715	break;	3715	break;
3716		3716
Lines 3740-3753 Link Here
3740	KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");	3740	KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
3741	return -EAGAIN;	3741	return -EAGAIN;
3742	}	3742	}
3743	vma->vm_flags \|= VM_SHM \| VM_RESERVED; /* Don't swap */	3743	vma->vm_flags \|= VM_SHM \| VM_IO; /* Don't swap */
3744	vma->vm_ops = &vm_ops;	3744	vma->vm_ops = &vm_ops;
3745	}	3745	}
3746	break;	3746	break;
3747	#endif	3747	#endif
3748		3748
3749	case __KE_SHM:	3749	case __KE_SHM:
3750	vma->vm_flags \|= VM_SHM \| VM_RESERVED; /* Don't swap */	3750	vma->vm_flags \|= VM_SHM \| VM_IO; /* Don't swap */
3751	vma->vm_ops = &vm_shm_ops;	3751	vma->vm_ops = &vm_shm_ops;
3752	break;	3752	break;
3753		3753
Lines 3755-3761 Link Here
3755		3755
3756	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;	3756	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
3757		3757
3758	vma->vm_flags \|= VM_RESERVED;	3758	vma->vm_flags \|= VM_IO;
3759		3759
3760	//vma->vm_flags \|= VM_SHM \| VM_LOCKED; /* DDDDDDDDDDon't swap */	3760	//vma->vm_flags \|= VM_SHM \| VM_LOCKED; /* DDDDDDDDDDon't swap */
3761	//vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */	3761	//vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
Lines 3764-3777 Link Here
3764		3764
3765	case __KE_CTX:	3765	case __KE_CTX:
3766	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;	3766	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
3767	vma->vm_flags \|= VM_LOCKED \| VM_SHM \| VM_RESERVED; /* Don't swap */	3767	vma->vm_flags \|= VM_LOCKED \| VM_SHM \| VM_IO; /* Don't swap */
3768	vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */	3768	vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
3769	vma->vm_ops = &vm_ctx_ops;	3769	vma->vm_ops = &vm_ctx_ops;
3770	break;	3770	break;
3771		3771
3772	case __KE_PCI_BQS:	3772	case __KE_PCI_BQS:
3773	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;	3773	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
3774	vma->vm_flags \|= VM_LOCKED \| VM_SHM \| VM_RESERVED; /* Don't swap */	3774	vma->vm_flags \|= VM_LOCKED \| VM_SHM \| VM_IO; /* Don't swap */
3775	vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */	3775	vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
3776	vma->vm_ops = &vm_pci_bq_ops;	3776	vma->vm_ops = &vm_pci_bq_ops;
3777	break;	3777	break;
Lines 3802-3810 Link Here
3802	return -EAGAIN;	3802	return -EAGAIN;
3803	}	3803	}
3804	#ifdef __x86_64__	3804	#ifdef __x86_64__
3805	vma->vm_flags \|= VM_RESERVED;	3805	vma->vm_flags \|= VM_IO;
3806	#else	3806	#else
3807	vma->vm_flags \|= VM_SHM \| VM_RESERVED; /* Don't swap */	3807	vma->vm_flags \|= VM_SHM \| VM_IO; /* Don't swap */
3808	#endif	3808	#endif
3809	vma->vm_ops = &vm_ops;	3809	vma->vm_ops = &vm_ops;
3810	}	3810	}
Lines 3833-3841 Link Here
3833	return -EAGAIN;	3833	return -EAGAIN;
3834	}	3834	}
3835	#ifdef __x86_64__	3835	#ifdef __x86_64__
3836	vma->vm_flags \|= VM_RESERVED;	3836	vma->vm_flags \|= VM_IO;
3837	#else	3837	#else
3838	vma->vm_flags \|= VM_SHM \| VM_RESERVED; /* Don't swap */	3838	vma->vm_flags \|= VM_SHM \| VM_IO; /* Don't swap */
3839	#endif	3839	#endif
3840	vma->vm_ops = &vm_agp_bq_ops;	3840	vma->vm_ops = &vm_agp_bq_ops;
3841	}	3841	}
Lines 3843-3849 Link Here
3843	#endif /* __AGP__BUILTIN__ */	3843	#endif /* __AGP__BUILTIN__ */
3844		3844
3845	case __KE_KMAP:	3845	case __KE_KMAP:
3846	vma->vm_flags \|= VM_SHM \| VM_RESERVED;	3846	vma->vm_flags \|= VM_SHM \| VM_IO;
3847	vma->vm_ops = &vm_kmap_ops;	3847	vma->vm_ops = &vm_kmap_ops;
3848	if (readonly && (vma->vm_flags & VM_WRITE))	3848	if (readonly && (vma->vm_flags & VM_WRITE))
3849	{	3849	{
Lines 3864-3870 Link Here
3864	#endif	3864	#endif
3865	// fall through	3865	// fall through
3866	case __KE_GART_CACHEABLE:	3866	case __KE_GART_CACHEABLE:
3867	vma->vm_flags \|= VM_RESERVED;	3867	vma->vm_flags \|= VM_IO;
3868	vma->vm_ops = &vm_gart_ops;	3868	vma->vm_ops = &vm_gart_ops;
3869	break;	3869	break;
3870	default:	3870	default: