Skip to content

Commit c087a5c

Browse files
xzpeterakpm00
authored andcommitted
mm: recover pud_leaf() definitions in nopmd case
This reverts one change in commit 924bd6a ("mm/x86: drop two unnecessary pud_leaf() definitions"). One issue with that is it broke nopmd builds for at least both arm64 and riscv (CONFIG_PGTABLE_LEVELS=2). The other issue is it was overlooked that it's a common change rather than x86 specific (relevant to the commit message of the commit). Normally there's no need for empty definition of pXd_leaf() because of the fallback functions, however this logic may not apply to pgtable-nopmd.h, because that's a header that can even be used by arch *pgtable.h headers, which can use the *_leaf() definitions _before_ the fallback functions are defined. Leave it there to pass PGTABLE_LEVELS=2 builds. Link: https://lkml.kernel.org/r/Ze8vFNV9YSdgC2S7@x1n Fixes: 924bd6a ("mm/x86: drop two unnecessary pud_leaf() definitions") Signed-off-by: Peter Xu <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/ Cc: Jason Gunthorpe <[email protected]> Cc: Mike Rapoport (IBM) <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 84d147d commit c087a5c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

include/asm-generic/pgtable-nopmd.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ static inline int pud_none(pud_t pud) { return 0; }
3131
static inline int pud_bad(pud_t pud) { return 0; }
3232
static inline int pud_present(pud_t pud) { return 1; }
3333
static inline int pud_user(pud_t pud) { return 0; }
34+
static inline int pud_leaf(pud_t pud) { return 0; }
3435
static inline void pud_clear(pud_t *pud) { }
3536
#define pmd_ERROR(pmd) (pud_ERROR((pmd).pud))
3637

0 commit comments

Comments
 (0)