From 6990f825b22bf2b44628531ad9b3e823f739b22b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 11 Dec 2008 17:06:35 +1000 Subject: [PATCH] --- yaml --- r: 123429 b: refs/heads/master c: ae14dc0505261978ca06075ac39cc5422c6c6b57 h: refs/heads/master i: 123427: a694e09c50c786b883334d7e05207642a157b605 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_gem.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3734889a155a..9feda687b784 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa91c6665a5e387e488c4a0b5da2536cc9c9f16e +refs/heads/master: ae14dc0505261978ca06075ac39cc5422c6c6b57 diff --git a/trunk/drivers/gpu/drm/drm_gem.c b/trunk/drivers/gpu/drm/drm_gem.c index b3939de6affd..9da581452874 100644 --- a/trunk/drivers/gpu/drm/drm_gem.c +++ b/trunk/drivers/gpu/drm/drm_gem.c @@ -516,7 +516,9 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_private_data = map->handle; /* FIXME: use pgprot_writecombine when available */ prot = pgprot_val(vma->vm_page_prot); +#ifdef CONFIG_X86 prot |= _PAGE_CACHE_WC; +#endif vma->vm_page_prot = __pgprot(prot); vma->vm_file = filp; /* Needed for drm_vm_open() */