[Xen-devel] [PATCH v3 15/15] x86/paravirt: remove unneeded mmu related paravirt ops bits

[Juergen Gross <jgross@xxxxxxxx>]

There is no need to have 32-bit code for CONFIG_PGTABLE_LEVELS >= 4.
Remove it.

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 arch/x86/include/asm/paravirt.h | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 63ab58dc5b73..969343c72a9b 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -506,25 +506,14 @@ static inline pud_t __pud(pudval_t val)
 {
        pudval_t ret;
 
-       if (sizeof(pudval_t) > sizeof(long))
-               ret = PVOP_CALLEE2(pudval_t, mmu.make_pud, val, (u64)val >> 32);
-       else
-               ret = PVOP_CALLEE1(pudval_t, mmu.make_pud, val);
+       ret = PVOP_CALLEE1(pudval_t, mmu.make_pud, val);
 
        return (pud_t) { ret };
 }
 
 static inline pudval_t pud_val(pud_t pud)
 {
-       pudval_t ret;
-
-       if (sizeof(pudval_t) > sizeof(long))
-               ret =  PVOP_CALLEE2(pudval_t, mmu.pud_val,
-                                   pud.pud, (u64)pud.pud >> 32);
-       else
-               ret =  PVOP_CALLEE1(pudval_t, mmu.pud_val, pud.pud);
-
-       return ret;
+       return PVOP_CALLEE1(pudval_t, mmu.pud_val, pud.pud);
 }
 
 static inline void pud_clear(pud_t *pudp)
@@ -536,10 +525,7 @@ static inline void set_p4d(p4d_t *p4dp, p4d_t p4d)
 {
        p4dval_t val = native_p4d_val(p4d);
 
-       if (sizeof(p4dval_t) > sizeof(long))
-               PVOP_VCALL3(mmu.set_p4d, p4dp, val, (u64)val >> 32);
-       else
-               PVOP_VCALL2(mmu.set_p4d, p4dp, val);
+       PVOP_VCALL2(mmu.set_p4d, p4dp, val);
 }
 
 #if CONFIG_PGTABLE_LEVELS >= 5
-- 
2.16.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel