diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-x86/cacheflush.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-x86/cacheflush.h')
| -rw-r--r-- | include/asm-x86/cacheflush.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/asm-x86/cacheflush.h b/include/asm-x86/cacheflush.h index f4c0ab50d2c2..68840ef1b35a 100644 --- a/include/asm-x86/cacheflush.h +++ b/include/asm-x86/cacheflush.h | |||
| @@ -1,5 +1,5 @@ | |||
| 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. */ | 4 | /* Keep includes the same across arches. */ |
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| @@ -24,6 +24,8 @@ | |||
| 24 | #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ | 24 | #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ |
| 25 | memcpy((dst), (src), (len)) | 25 | memcpy((dst), (src), (len)) |
| 26 | 26 | ||
| 27 | #define PG_non_WB PG_arch_1 | ||
| 28 | PAGEFLAG(NonWB, non_WB) | ||
| 27 | 29 | ||
| 28 | /* | 30 | /* |
| 29 | * The set_memory_* API can be used to change various attributes of a virtual | 31 | * The set_memory_* API can be used to change various attributes of a virtual |
| @@ -66,6 +68,9 @@ int set_memory_rw(unsigned long addr, int numpages); | |||
| 66 | int set_memory_np(unsigned long addr, int numpages); | 68 | int set_memory_np(unsigned long addr, int numpages); |
| 67 | int set_memory_4k(unsigned long addr, int numpages); | 69 | int set_memory_4k(unsigned long addr, int numpages); |
| 68 | 70 | ||
| 71 | int set_memory_array_uc(unsigned long *addr, int addrinarray); | ||
| 72 | int set_memory_array_wb(unsigned long *addr, int addrinarray); | ||
| 73 | |||
| 69 | /* | 74 | /* |
| 70 | * For legacy compatibility with the old APIs, a few functions | 75 | * For legacy compatibility with the old APIs, a few functions |
| 71 | * are provided that work on a "struct page". | 76 | * are provided that work on a "struct page". |
| @@ -96,8 +101,6 @@ int set_pages_rw(struct page *page, int numpages); | |||
| 96 | 101 | ||
| 97 | void clflush_cache_range(void *addr, unsigned int size); | 102 | void clflush_cache_range(void *addr, unsigned int size); |
| 98 | 103 | ||
| 99 | void cpa_init(void); | ||
| 100 | |||
| 101 | #ifdef CONFIG_DEBUG_RODATA | 104 | #ifdef CONFIG_DEBUG_RODATA |
| 102 | void mark_rodata_ro(void); | 105 | void mark_rodata_ro(void); |
| 103 | extern const int rodata_test_data; | 106 | extern const int rodata_test_data; |
| @@ -112,4 +115,4 @@ static inline int rodata_test(void) | |||
| 112 | } | 115 | } |
| 113 | #endif | 116 | #endif |
| 114 | 117 | ||
| 115 | #endif | 118 | #endif /* ASM_X86__CACHEFLUSH_H */ |