mm-always-define-pxx_pgprot.patch removed from -mm tree
The quilt patch titled
Subject: mm: always define pxx_pgprot()
has been removed from the -mm tree. Its filename was
mm-always-define-pxx_pgprot.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm: always define pxx_pgprot()
Date: Mon, 26 Aug 2024 16:43:42 -0400
There're:
- 8 archs (arc, arm64, include, mips, powerpc, s390, sh, x86) that support pte_pgprot().
- 2 archs (x86, sparc) that support pmd_pgprot().
- 1 arch (x86) that support pud_pgprot().
Always define them to be used in generic code, and then we don't need to fiddle with "#ifdef"s when doing so.
---
arch/arm64/include/asm/pgtable.h | 1 + arch/powerpc/include/asm/pgtable.h | 1 + arch/s390/include/asm/pgtable.h | 1 + arch/sparc/include/asm/pgtable_64.h | 1 + include/linux/pgtable.h | 12 ++++++++++++ 5 files changed, 16 insertions(+)
arch/arm64/include/asm/pgtable.h renamed from arch/arm64/include/asm/pgtable.h~mm-always-define-pxx_pgprot +1 -0
@@ -384,6 +384,7 @@ static inline void __sync_cache_and_tags/* * Select all bits except the pfn */ +#define pte_pgprot pte_pgprotstatic inline pgprot_t pte_pgprot (pte_t pte) {unsigned long pfn =pte_pfn (pte);
arch/powerpc/include/asm/pgtable.h renamed from arch/powerpc/include/asm/pgtable.h~mm-always-define-pxx_pgprot +1 -0
@@ -65,6 +65,7 @@ static inline unsigned long pte_pfn(pte_/* * Select all bits except the pfn */ +#define pte_pgprot pte_pgprotstatic inline pgprot_t pte_pgprot (pte_t pte) {unsigned long pte_flags;
arch/s390/include/asm/pgtable.h renamed from arch/s390/include/asm/pgtable.h~mm-always-define-pxx_pgprot +1 -0
@@ -955,6 +955,7 @@ static inline int pte_unused(pte_t pte)* young/old accounting is not supported, i.e _PAGE_PROTECT and _PAGE_INVALID * must not be set. */ +#define pte_pgprot pte_pgprotstatic inline pgprot_t pte_pgprot (pte_t pte) {unsigned long pte_flags =pte_val (pte) & _PAGE_CHG_MASK;
arch/sparc/include/asm/pgtable_64.h renamed from arch/sparc/include/asm/pgtable_64.h~mm-always-define-pxx_pgprot +1 -0
@@ -783,6 +783,7 @@ static inline pmd_t pmd_mkwrite_novma(pmreturn __pmd (pte_val (pte)); } +#define pmd_pgprot pmd_pgprotstatic inline pgprot_t pmd_pgprot (pmd_t entry) {unsigned long val =pmd_val (entry);
include/linux/pgtable.h renamed from include/linux/pgtable.h~mm-always-define-pxx_pgprot +12 -0
@@ -1956,6 +1956,18 @@ typedef unsigned int pgtbl_mod_mask;#define MAX_PTRS_PER_P4D PTRS_PER_P4D#endif +#ifndef pte_pgprot +#define pte_pgprot (x) ((pgprot_t) {0}) +#endif + +#ifndef pmd_pgprot +#define pmd_pgprot (x) ((pgprot_t) {0}) +#endif + +#ifndef pud_pgprot +#define pud_pgprot (x) ((pgprot_t) {0}) +#endif +/* description of effects of mapping type and prot in current implementation. * this is due to the limited x86 page protection hardware. The expected * behavior is in parens:
_
Patches currently in -mm which might be from [email protected] are