diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-09-30 09:33:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-09-30 09:33:14 +0200 |
| commit | 3ebb3531c6d0d533fddc65fa3bed174291d71956 (patch) | |
| tree | 2e5c6d4106a1ae03029136a9df5affa1df285203 /arch/x86/include/asm | |
| parent | d2cfd545289e643118560e58e308134895ae4906 (diff) | |
| parent | 4f8c177caac8ecdedeb95caa673214fc3f6a75cb (diff) | |
| download | linux-next-3ebb3531c6d0d533fddc65fa3bed174291d71956.tar.gz linux-next-3ebb3531c6d0d533fddc65fa3bed174291d71956.zip | |
Merge branch into tip/master: 'x86/mm'
# New commits in x86/mm:
4f8c177caac8 ("x86/mm: Fix void/int conditional in pgd_clear()")
ea6fd393cb9e ("x86/mm/pat: Use pr_warn() for early W^X warnings")
ebaf7c9bbb1e ("x86/mm/pat: Fix effective RW computation in lookup_address_in_pgd_attr()")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index d551120a7c88..c79554dac5f7 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -66,7 +66,11 @@ extern pmdval_t early_pmd_flags; #ifndef __PAGETABLE_P4D_FOLDED #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd) -#define pgd_clear(pgd) (pgtable_l5_enabled() ? native_pgd_clear(pgd) : 0) +#define pgd_clear(pgdp) \ +do { \ + if (pgtable_l5_enabled()) \ + native_pgd_clear(pgdp); \ +} while (0) #endif #ifndef set_p4d |