From af395788ddc02a5f8a2018438b385a1b5c05ad36 Mon Sep 17 00:00:00 2001 From: "venkatesh.pallipadi@intel.com" Date: Tue, 18 Mar 2008 17:00:23 -0700 Subject: [PATCH] --- yaml --- r: 88895 b: refs/heads/master c: ef354af4629e5cc76a3f64fc46d452f2b56d5a59 h: refs/heads/master i: 88893: 45981408c0cc52d0be92428e43410aaabee375d4 88891: f1d3f799d1233074363be88699d5834f533bc975 88887: f07d6267f2804e085737d6bd1e895b61b39f8158 88879: 51e73c1f01c4b0694124cf269845df3481ab9ebd 88863: 1b82037c4bde06d698bcd8e72aa9e7d233380de3 88831: 1c4cf3aaafa5540de766ecfe9e82666a5a9568f9 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/pageattr.c | 19 +++++++++++++++++++ trunk/include/asm-x86/cacheflush.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4e0eb9c214c5..db445c8b61cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03d72aa18f15df9987fe5837284e15b9ccf6e3f8 +refs/heads/master: ef354af4629e5cc76a3f64fc46d452f2b56d5a59 diff --git a/trunk/arch/x86/mm/pageattr.c b/trunk/arch/x86/mm/pageattr.c index 938df5e8402b..270cab2e6030 100644 --- a/trunk/arch/x86/mm/pageattr.c +++ b/trunk/arch/x86/mm/pageattr.c @@ -787,6 +787,25 @@ int set_memory_uc(unsigned long addr, int numpages) } EXPORT_SYMBOL(set_memory_uc); +int _set_memory_wc(unsigned long addr, int numpages) +{ + return change_page_attr_set(addr, numpages, + __pgprot(_PAGE_CACHE_WC)); +} + +int set_memory_wc(unsigned long addr, int numpages) +{ + if (!pat_wc_enabled) + return set_memory_uc(addr, numpages); + + if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, + _PAGE_CACHE_WC, NULL)) + return -EINVAL; + + return _set_memory_wc(addr, numpages); +} +EXPORT_SYMBOL(set_memory_wc); + int _set_memory_wb(unsigned long addr, int numpages) { return change_page_attr_clear(addr, numpages, diff --git a/trunk/include/asm-x86/cacheflush.h b/trunk/include/asm-x86/cacheflush.h index 5676fba10a09..90437d3f7610 100644 --- a/trunk/include/asm-x86/cacheflush.h +++ b/trunk/include/asm-x86/cacheflush.h @@ -35,8 +35,10 @@ int set_pages_ro(struct page *page, int numpages); int set_pages_rw(struct page *page, int numpages); int _set_memory_uc(unsigned long addr, int numpages); +int _set_memory_wc(unsigned long addr, int numpages); int _set_memory_wb(unsigned long addr, int numpages); int set_memory_uc(unsigned long addr, int numpages); +int set_memory_wc(unsigned long addr, int numpages); int set_memory_wb(unsigned long addr, int numpages); int set_memory_x(unsigned long addr, int numpages); int set_memory_nx(unsigned long addr, int numpages);