summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQian Cai <cai@lca.pw>2019-03-01 10:29:24 -0500
committerThomas Gleixner <tglx@linutronix.de>2019-03-06 17:24:53 -0500
commit24c41220659ecc5576c34c6f23537f8d3949fb05 (patch)
tree3d48ff133199f46b71d99cc4eb995b85bcdca05b
parent3609e31bc8dc03b701390f79c74fc7fe92b95039 (diff)
x86/mm: Remove unused variable 'old_pte'
The commit 3a19109efbfa ("x86/mm: Fix try_preserve_large_page() to handle large PAT bit") fixed try_preserve_large_page() by using the corresponding pud/pmd prot/pfn interfaces, but left a variable unused because it no longer used pte_pfn(). Later, the commit 8679de0959e6 ("x86/mm/cpa: Split, rename and clean up try_preserve_large_page()") renamed try_preserve_large_page() to __should_split_large_page(), but the unused variable remains. arch/x86/mm/pageattr.c: In function '__should_split_large_page': arch/x86/mm/pageattr.c:741:17: warning: variable 'old_pte' set but not used [-Wunused-but-set-variable] Fixes: 3a19109efbfa ("x86/mm: Fix try_preserve_large_page() to handle large PAT bit") Signed-off-by: Qian Cai <cai@lca.pw> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: dave.hansen@linux.intel.com Cc: luto@kernel.org Cc: peterz@infradead.org Cc: toshi.kani@hpe.com Cc: bp@alien8.de Cc: hpa@zytor.com Link: https://lkml.kernel.org/r/20190301152924.94762-1-cai@lca.pw
-rw-r--r--arch/x86/mm/pageattr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 14e6119838a6..4c570612e24e 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -738,7 +738,7 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,
738{ 738{
739 unsigned long numpages, pmask, psize, lpaddr, pfn, old_pfn; 739 unsigned long numpages, pmask, psize, lpaddr, pfn, old_pfn;
740 pgprot_t old_prot, new_prot, req_prot, chk_prot; 740 pgprot_t old_prot, new_prot, req_prot, chk_prot;
741 pte_t new_pte, old_pte, *tmp; 741 pte_t new_pte, *tmp;
742 enum pg_level level; 742 enum pg_level level;
743 743
744 /* 744 /*
@@ -781,7 +781,7 @@ static int __should_split_large_page(pte_t *kpte, unsigned long address,
781 * Convert protection attributes to 4k-format, as cpa->mask* are set 781 * Convert protection attributes to 4k-format, as cpa->mask* are set
782 * up accordingly. 782 * up accordingly.
783 */ 783 */
784 old_pte = *kpte; 784
785 /* Clear PSE (aka _PAGE_PAT) and move PAT bit to correct position */ 785 /* Clear PSE (aka _PAGE_PAT) and move PAT bit to correct position */
786 req_prot = pgprot_large_2_4k(old_prot); 786 req_prot = pgprot_large_2_4k(old_prot);
787 787