Merge branch 'x86/pti' into x86/mm, to pick up dependencies

[linux-2.6-microblaze.git] / arch / x86 / include / asm / paravirt.h

diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index c83a2f4..9be2bf1 100644 (file)
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -568,17 +568,22 @@ static inline p4dval_t p4d_val(p4d_t p4d)
        return PVOP_CALLEE1(p4dval_t, pv_mmu_ops.p4d_val, p4d.p4d);
 }
 
-static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
+static inline void __set_pgd(pgd_t *pgdp, pgd_t pgd)
 {
-       pgdval_t val = native_pgd_val(pgd);
-
-       PVOP_VCALL2(pv_mmu_ops.set_pgd, pgdp, val);
+       PVOP_VCALL2(pv_mmu_ops.set_pgd, pgdp, native_pgd_val(pgd));
 }
 
-static inline void pgd_clear(pgd_t *pgdp)
-{
-       set_pgd(pgdp, __pgd(0));
-}
+#define set_pgd(pgdp, pgdval) do {                                     \
+       if (pgtable_l5_enabled)                                         \
+               __set_pgd(pgdp, pgdval);                                \
+       else                                                            \
+               set_p4d((p4d_t *)(pgdp), (p4d_t) { (pgdval).pgd });     \
+} while (0)
+
+#define pgd_clear(pgdp) do {                                           \
+       if (pgtable_l5_enabled)                                         \
+               set_pgd(pgdp, __pgd(0));                                \
+} while (0)
 
 #endif  /* CONFIG_PGTABLE_LEVELS == 5 */