diff --git a/[refs] b/[refs]
index 9ea35e5ca9d0..f892d4b642db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa8a123855e20068204982596b8fafceb1a67f0b
+refs/heads/master: ed017d9fb17af3162f5acf922eb5731c541e1f3a
diff --git a/trunk/drivers/gpu/drm/drm_cache.c b/trunk/drivers/gpu/drm/drm_cache.c
index 3a5575e638db..0e3bd5b54b78 100644
--- a/trunk/drivers/gpu/drm/drm_cache.c
+++ b/trunk/drivers/gpu/drm/drm_cache.c
@@ -62,11 +62,8 @@ drm_clflush_ipi_handler(void *null)
 {
 	wbinvd();
 }
-#elif !defined(__powerpc__)
-static void drm_cache_ipi_handler(void *dummy)
-{
-}
 #endif
+
 void
 drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 {
@@ -95,8 +92,8 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 		kunmap_atomic(page_virtual, KM_USER0);
 	}
 #else
-	if (on_each_cpu(drm_clflush_ipi_handler, NULL, 1) != 0)
-		printk(KERN_ERR "Timed out waiting for drm cache flush\n");
+	printk(KERN_ERR "Architecture has no drm_cache.c support\n");
+	WARN_ON_ONCE(1);
 #endif
 }
 EXPORT_SYMBOL(drm_clflush_pages);