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() */