| Message ID | 20240305043750.93762-6-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/treewide: Replace pXd_large() with pXd_leaf() | expand |
On Tue, Mar 05, 2024 at 12:37:45PM +0800, peterx@redhat.com wrote: > From: Peter Xu <peterx@redhat.com> > > pud_leaf() has a fallback macro defined in include/linux/pgtable.h already. > Drop the extra two for x86. > > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: Dave Hansen <dave.hansen@linux.intel.com> > Cc: x86@kernel.org > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > Acked-by: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org> > --- > arch/x86/include/asm/pgtable.h | 1 - > include/asm-generic/pgtable-nopmd.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index d6e993a5659f..9db7a38a0e9f 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1097,7 +1097,6 @@ static inline int pud_bad(pud_t pud) > return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; > } > #else > -#define pud_leaf pud_large > static inline int pud_large(pud_t pud) > { > return 0; > diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h > index 8ffd64e7a24c..fa27e16bbe1b 100644 > --- a/include/asm-generic/pgtable-nopmd.h > +++ b/include/asm-generic/pgtable-nopmd.h > @@ -31,7 +31,6 @@ static inline int pud_none(pud_t pud) { return 0; } > static inline int pud_bad(pud_t pud) { return 0; } > static inline int pud_present(pud_t pud) { return 1; } > static inline int pud_user(pud_t pud) { return 0; } > -static inline int pud_leaf(pud_t pud) { return 0; } > static inline void pud_clear(pud_t *pud) { } > #define pmd_ERROR(pmd) (pud_ERROR((pmd).pud)) > > -- > 2.44.0 > >
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index d6e993a5659f..9db7a38a0e9f 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1097,7 +1097,6 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; } #else -#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return 0; diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h index 8ffd64e7a24c..fa27e16bbe1b 100644 --- a/include/asm-generic/pgtable-nopmd.h +++ b/include/asm-generic/pgtable-nopmd.h @@ -31,7 +31,6 @@ static inline int pud_none(pud_t pud) { return 0; } static inline int pud_bad(pud_t pud) { return 0; } static inline int pud_present(pud_t pud) { return 1; } static inline int pud_user(pud_t pud) { return 0; } -static inline int pud_leaf(pud_t pud) { return 0; } static inline void pud_clear(pud_t *pud) { } #define pmd_ERROR(pmd) (pud_ERROR((pmd).pud))