diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 04:23:27 -0500 |
| commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
| tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /arch/x86/include/asm/cacheflush.h | |
| parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
| parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'arch/x86/include/asm/cacheflush.h')
| -rw-r--r-- | arch/x86/include/asm/cacheflush.h | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h index 63e35ec9075c..62f084478f7e 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 | /* |