From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759613AbbIVTol (ORCPT ); Tue, 22 Sep 2015 15:44:41 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54598 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758474AbbIVToh (ORCPT ); Tue, 22 Sep 2015 15:44:37 -0400 Date: Tue, 22 Sep 2015 12:43:54 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: toshi.kani@hpe.com, konrad.wilk@oracle.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, elliott@hpe.com, tglx@linutronix.de, bp@alien8.de, akpm@linux-foundation.org, jgross@suse.com, mingo@redhat.com Reply-To: toshi.kani@hpe.com, konrad.wilk@oracle.com, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, elliott@hpe.com, tglx@linutronix.de, bp@alien8.de, jgross@suse.com, akpm@linux-foundation.org, mingo@redhat.com In-Reply-To: <1442514264-12475-6-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-6-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/asm: Add pud_pgprot() and pmd_pgprot() Git-Commit-ID: bbac8c6deadab921f4b7d00ce675ffa4f358ec7f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: bbac8c6deadab921f4b7d00ce675ffa4f358ec7f Gitweb: http://git.kernel.org/tip/bbac8c6deadab921f4b7d00ce675ffa4f358ec7f Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:18 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:32 +0200 x86/asm: Add pud_pgprot() and pmd_pgprot() pte_pgprot() returns a pgprot_t value by calling pte_flags(). Now that pud_flags() and pmd_flags() work specifically for the pud/pmd levels, define pud_pgprot() and pmd_pgprot() for PUD/PMD. Also update pte_pgprot() to remove the unnecessary mask with PTE_FLAGS_MASK as pte_flags() takes care of it. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Juergen Gross Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: Konrad Wilk Cc: Robert Elliot Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-6-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/pgtable.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 0733ec7..59fc341 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -379,7 +379,9 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) return __pgprot(preservebits | addbits); } -#define pte_pgprot(x) __pgprot(pte_flags(x) & PTE_FLAGS_MASK) +#define pte_pgprot(x) __pgprot(pte_flags(x)) +#define pmd_pgprot(x) __pgprot(pmd_flags(x)) +#define pud_pgprot(x) __pgprot(pud_flags(x)) #define canon_pgprot(p) __pgprot(massage_pgprot(p))