diff --git a/[refs] b/[refs]
index fd65f31ec183..1a30755595da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7d22bc3cb57126196c4f475d4e55aa44e151784
+refs/heads/master: e0f0754ff6128570dcf38032f5bfb1f195e5bbee
diff --git a/trunk/drivers/gpu/drm/drm_cache.c b/trunk/drivers/gpu/drm/drm_cache.c
index 9475f7d9901d..0e994a0e46d4 100644
--- a/trunk/drivers/gpu/drm/drm_cache.c
+++ b/trunk/drivers/gpu/drm/drm_cache.c
@@ -47,12 +47,6 @@ drm_clflush_page(struct page *page)
 }
 #endif
 
-static void
-drm_clflush_ipi_handler(void *null)
-{
-	wbinvd();
-}
-
 void
 drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 {
@@ -68,9 +62,8 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 
 		return;
 	}
-#endif
 
-	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
-		DRM_ERROR("Timed out waiting for cache flush.\n");
+	wbinvd();
+#endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);