x86/mm: Remove the unused set_memory_wt() function

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20190826075558.8125-5-hch@lst.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index fd549c3ebb177919446b1f331498911532347910..2ee8e469dcf5ce88845aca1cb62385b6df4a6dfd 100644 (file)
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -40,7 +40,6 @@ int _set_memory_wt(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_wt(unsigned long addr, int numpages);
 int set_memory_wb(unsigned long addr, int numpages);
 int set_memory_np(unsigned long addr, int numpages);
 int set_memory_4k(unsigned long addr, int numpages);

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index d5586a0127451f81a48c9ce98b1ff243f1cdbb03..0d09cc5aad6142e3591e3e90acb2376cf6be3430 100644 (file)
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1858,23 +1858,6 @@ int _set_memory_wt(unsigned long addr, int numpages)
                                    cachemode2pgprot(_PAGE_CACHE_MODE_WT), 0);
 }
 
-int set_memory_wt(unsigned long addr, int numpages)
-{
-       int ret;
-
-       ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE,
-                             _PAGE_CACHE_MODE_WT, NULL);
-       if (ret)
-               return ret;
-
-       ret = _set_memory_wt(addr, numpages);
-       if (ret)
-               free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(set_memory_wt);
-
 int _set_memory_wb(unsigned long addr, int numpages)
 {
        /* WB cache mode is hard wired to all cache attribute bits being 0 */