From 0ee3ab0b7722dff2ef10bbbc97944cac4a6842ca Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 31 Jan 2011 11:30:07 +0100
Subject: [PATCH] --- yaml --- r: 232743 b: refs/heads/master c:
 786cca889264836fad841757a1bf1bbaa7a16010 h: refs/heads/master i:   232741:
 746ffd5a3b16c2237ae33a4b007c782b412410bc   232739:
 ebe56266b27d6052d7721f72620b438f67e90934   232735:
 19df1499244b2ebd773cfb198c501ea766db4e22 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/s390/include/asm/cacheflush.h | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index cb678da6a36c..cf966ee7838b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c84ca00819e8a441d79c61883a275d8982f04cb2
+refs/heads/master: 786cca889264836fad841757a1bf1bbaa7a16010
diff --git a/trunk/arch/s390/include/asm/cacheflush.h b/trunk/arch/s390/include/asm/cacheflush.h
index 405cc97c6249..7e1f77620624 100644
--- a/trunk/arch/s390/include/asm/cacheflush.h
+++ b/trunk/arch/s390/include/asm/cacheflush.h
@@ -1,29 +1,8 @@
 #ifndef _S390_CACHEFLUSH_H
 #define _S390_CACHEFLUSH_H
 
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
-
 /* Caches aren't brain-dead on the s390. */
-#define flush_cache_all()			do { } while (0)
-#define flush_cache_mm(mm)			do { } while (0)
-#define flush_cache_dup_mm(mm)			do { } while (0)
-#define flush_cache_range(vma, start, end)	do { } while (0)
-#define flush_cache_page(vma, vmaddr, pfn)	do { } while (0)
-#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
-#define flush_dcache_page(page)			do { } while (0)
-#define flush_dcache_mmap_lock(mapping)		do { } while (0)
-#define flush_dcache_mmap_unlock(mapping)	do { } while (0)
-#define flush_icache_range(start, end)		do { } while (0)
-#define flush_icache_page(vma,pg)		do { } while (0)
-#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
-#define flush_cache_vmap(start, end)		do { } while (0)
-#define flush_cache_vunmap(start, end)		do { } while (0)
-
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-	memcpy(dst, src, len)
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-	memcpy(dst, src, len)
+#include <asm-generic/cacheflush.h>
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
 void kernel_map_pages(struct page *page, int numpages, int enable);