1 files changed, 2 insertions, 42 deletions
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 63e35ec9075c..4e12668711e5 100644
--- a/arch/x86/include/asm/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
@@ -1,48 +1,8 @@
 #ifndef _ASM_X86_CACHEFLUSH_H
 #define _ASM_X86_CACHEFLUSH_H
-/* Keep includes the same across arches.  */
-#include <linux/mm.h>
 /* Caches aren't brain-dead on the intel. */
-static inline void flush_cache_all(void) { }
+#include <asm-generic/cacheflush.h>
-static inline void flush_cache_mm(struct mm_struct *mm) { }
-static inline void flush_cache_dup_mm(struct mm_struct *mm) { }
-static inline void flush_cache_range(struct vm_area_struct *vma,
-                                     unsigned long start, unsigned long end) { }
-static inline void flush_cache_page(struct vm_area_struct *vma,
-                                    unsigned long vmaddr, unsigned long pfn) { }
-#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
-static inline void flush_dcache_page(struct page *page) { }
-static inline void flush_dcache_mmap_lock(struct address_space *mapping) { }
-static inline void flush_dcache_mmap_unlock(struct address_space *mapping) { }
-static inline void flush_icache_range(unsigned long start,
-                                      unsigned long end) { }
-static inline void flush_icache_page(struct vm_area_struct *vma,
-                                     struct page *page) { }
-static inline void flush_icache_user_range(struct vm_area_struct *vma,
-                                           struct page *page,
-                                           unsigned long addr,
-                                           unsigned long len) { }
-static inline void flush_cache_vmap(unsigned long start, unsigned long end) { }
-static inline void flush_cache_vunmap(unsigned long start,
-                                      unsigned long end) { }
-static inline void copy_to_user_page(struct vm_area_struct *vma,
-                                     struct page *page, unsigned long vaddr,
-                                     void *dst, const void *src,
-                                     unsigned long len)
-{
-        memcpy(dst, src, len);
-}
-static inline void copy_from_user_page(struct vm_area_struct *vma,
-                                       struct page *page, unsigned long vaddr,
-                                       void *dst, const void *src,
-                                       unsigned long len)
-{
-        memcpy(dst, src, len);
-}
 #ifdef CONFIG_X86_PAT
 /*
@@ -111,7 +71,7 @@ static inline void set_page_memtype(struct page *pg, unsigned long memtype) { }
 * Read/Write    : ReadOnly, ReadWrite
 * Presence      : NotPresent
 *
- * Within a catagory, the attributes are mutually exclusive.
+ * Within a category, the attributes are mutually exclusive.
 *
 * The implementation of this API will take care of various aspects that
 * are associated with changing such attributes, such as:

diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h index 63e35ec9075c..4e12668711e5 100644 --- a/arch/x86/include/asm/cacheflush.h +++ b/arch/x86/include/asm/cacheflush.h
@@ -1,48 +1,8 @@
1	#ifndef _ASM_X86_CACHEFLUSH_H	1	#ifndef _ASM_X86_CACHEFLUSH_H
2	#define _ASM_X86_CACHEFLUSH_H	2	#define _ASM_X86_CACHEFLUSH_H
3		3
4	/* Keep includes the same across arches. */
5	#include <linux/mm.h>
6
7	/* Caches aren't brain-dead on the intel. */	4	/* Caches aren't brain-dead on the intel. */
8	static inline void flush_cache_all(void) { }	5	#include <asm-generic/cacheflush.h>
9	static inline void flush_cache_mm(struct mm_struct *mm) { }
10	static inline void flush_cache_dup_mm(struct mm_struct *mm) { }
11	static inline void flush_cache_range(struct vm_area_struct *vma,
12	unsigned long start, unsigned long end) { }
13	static inline void flush_cache_page(struct vm_area_struct *vma,
14	unsigned long vmaddr, unsigned long pfn) { }
15	#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0
16	static inline void flush_dcache_page(struct page *page) { }
17	static inline void flush_dcache_mmap_lock(struct address_space *mapping) { }
18	static inline void flush_dcache_mmap_unlock(struct address_space *mapping) { }
19	static inline void flush_icache_range(unsigned long start,
20	unsigned long end) { }
21	static inline void flush_icache_page(struct vm_area_struct *vma,
22	struct page *page) { }
23	static inline void flush_icache_user_range(struct vm_area_struct *vma,
24	struct page *page,
25	unsigned long addr,
26	unsigned long len) { }
27	static inline void flush_cache_vmap(unsigned long start, unsigned long end) { }
28	static inline void flush_cache_vunmap(unsigned long start,
29	unsigned long end) { }
30
31	static inline void copy_to_user_page(struct vm_area_struct *vma,
32	struct page *page, unsigned long vaddr,
33	void dst, const void src,
34	unsigned long len)
35	{
36	memcpy(dst, src, len);
37	}
38
39	static inline void copy_from_user_page(struct vm_area_struct *vma,
40	struct page *page, unsigned long vaddr,
41	void dst, const void src,
42	unsigned long len)
43	{
44	memcpy(dst, src, len);
45	}
46		6
47	#ifdef CONFIG_X86_PAT	7	#ifdef CONFIG_X86_PAT
48	/*	8	/*
@@ -111,7 +71,7 @@ static inline void set_page_memtype(struct page *pg, unsigned long memtype) { }
111	* Read/Write : ReadOnly, ReadWrite	71	* Read/Write : ReadOnly, ReadWrite
112	* Presence : NotPresent	72	* Presence : NotPresent
113	*	73	*
114	* Within a catagory, the attributes are mutually exclusive.	74	* Within a category, the attributes are mutually exclusive.
115	*	75	*
116	* The implementation of this API will take care of various aspects that	76	* The implementation of this API will take care of various aspects that
117	* are associated with changing such attributes, such as:	77	* are associated with changing such attributes, such as: