Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933263AbcCKABD (ORCPT ); Thu, 10 Mar 2016 19:01:03 -0500 Received: from mga02.intel.com ([134.134.136.20]:63327 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932950AbcCJXzp (ORCPT ); Thu, 10 Mar 2016 18:55:45 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,317,1455004800"; d="scan'208";a="931363938" From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-mm@kvack.org, linux-nvdimm@ml01.01.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, willy@linux.intel.com Subject: [PATCH v5 07/14] x86: Unify native_*_get_and_clear !SMP case Date: Thu, 10 Mar 2016 18:55:24 -0500 Message-Id: <1457654131-4562-8-git-send-email-matthew.r.wilcox@intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1457654131-4562-1-git-send-email-matthew.r.wilcox@intel.com> References: <1457654131-4562-1-git-send-email-matthew.r.wilcox@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3724 Lines: 124 x86_32 and x86_64 had diverged slightly in their implementations of the non-SMP cases for native_ptep_get_and_clear() and native_pmdp_get_and_clear(). Unify the non-SMP cases in pgtable.h, leaving only the SMP cases in the other three files. Signed-off-by: Matthew Wilcox --- arch/x86/include/asm/pgtable-2level.h | 6 ------ arch/x86/include/asm/pgtable-3level.h | 7 +------ arch/x86/include/asm/pgtable.h | 5 +++++ arch/x86/include/asm/pgtable_64.h | 18 ++---------------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h index fd74a11..520318f 100644 --- a/arch/x86/include/asm/pgtable-2level.h +++ b/arch/x86/include/asm/pgtable-2level.h @@ -42,17 +42,11 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) { return __pte(xchg(&xp->pte_low, 0)); } -#else -#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) -#endif -#ifdef CONFIG_SMP static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp) { return __pmd(xchg((pmdval_t *)xp, 0)); } -#else -#define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp) #endif /* Bit manipulation helper on pte/pgoff entry */ diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index cdaa58c..b1b6412 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h @@ -149,11 +149,7 @@ static inline pte_t native_ptep_get_and_clear(pte_t *ptep) return res; } -#else -#define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) -#endif -#ifdef CONFIG_SMP union split_pmd { struct { u32 pmd_low; @@ -161,6 +157,7 @@ union split_pmd { }; pmd_t pmd; }; + static inline pmd_t native_pmdp_get_and_clear(pmd_t *pmdp) { union split_pmd res, *orig = (union split_pmd *)pmdp; @@ -172,8 +169,6 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *pmdp) return res.pmd; } -#else -#define native_pmdp_get_and_clear(xp) native_local_pmdp_get_and_clear(xp) #endif /* Encode and de-code a swap entry */ diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 1ff49ec..35306ca 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -740,6 +740,11 @@ static inline pmd_t native_local_pmdp_get_and_clear(pmd_t *pmdp) return res; } +#ifndef CONFIG_SMP +#define native_ptep_get_and_clear(p) native_local_ptep_get_and_clear(p) +#define native_pmdp_get_and_clear(p) native_local_pmdp_get_and_clear(p) +#endif + static inline void native_set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep , pte_t pte) { diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 2ee7811..a0c0219 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -70,31 +70,17 @@ static inline void native_pmd_clear(pmd_t *pmd) native_set_pmd(pmd, native_make_pmd(0)); } +#ifdef CONFIG_SMP static inline pte_t native_ptep_get_and_clear(pte_t *xp) { -#ifdef CONFIG_SMP return native_make_pte(xchg(&xp->pte, 0)); -#else - /* native_local_ptep_get_and_clear, - but duplicated because of cyclic dependency */ - pte_t ret = *xp; - native_pte_clear(NULL, 0, xp); - return ret; -#endif } static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp) { -#ifdef CONFIG_SMP return native_make_pmd(xchg(&xp->pmd, 0)); -#else - /* native_local_pmdp_get_and_clear, - but duplicated because of cyclic dependency */ - pmd_t ret = *xp; - native_pmd_clear(xp); - return ret; -#endif } +#endif static inline void native_set_pud(pud_t *pudp, pud_t pud) { -- 2.7.0