From 730cd99494f572afbdc93f0e565c8fb3f4d4e1fb Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun, 25 Mar 2012 19:47:39 +0200
Subject: [PATCH] --- yaml --- r: 306999 b: refs/heads/master c:
 117babcdd51ed8a9bb8d4921b292918acb6e0d70 h: refs/heads/master i:   306997:
 6bf29d02c0906aef2a4e261a34bcd28ba1725ac1   306995:
 5fe84fce5211506e46880c1d66bdbcc54c1e3d96   306991:
 d34d12ea3271e24834c68b4688aea380377f4c10 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7a9066f751f3..2eaa390af628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc62976d215870e3082d9778660167c5fa3946d
+refs/heads/master: 117babcdd51ed8a9bb8d4921b292918acb6e0d70
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 7f33e6af6ecb..c84060ce6bf8 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -642,9 +642,9 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
 			if (partial_cacheline_write)
 				drm_clflush_virt_range(vaddr + shmem_page_offset,
 						       page_length);
-			ret = __copy_from_user_inatomic(vaddr + shmem_page_offset,
-							user_data,
-							page_length);
+			ret = __copy_from_user_inatomic_nocache(vaddr + shmem_page_offset,
+								user_data,
+								page_length);
 			if (needs_clflush_after)
 				drm_clflush_virt_range(vaddr + shmem_page_offset,
 						       page_length);