x86/paravirt: Remove unneeded mmu related paravirt ops bits

jgross1 · KAGA-KOKO · commit 495310e4f2dd · 2018-09-03T16:50:37.000+02:00
There is no need to have 32-bit code for CONFIG_PGTABLE_LEVELS >= 4. Remove it. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: xen-devel@lists.xenproject.org Cc: virtualization@lists.linux-foundation.org Cc: akataria@vmware.com Cc: rusty@rustcorp.com.au Cc: boris.ostrovsky@oracle.com Cc: hpa@zytor.com Link: https://lkml.kernel.org/r/20180828074026.820-16-jgross@suse.com
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -506,25 +506,14 @@ static inline pud_t __pud(pudval_t val)`
`506`	`506`	`{`
`507`	`507`	`pudval_t ret;`
`508`	`508`
`509`		`- if (sizeof(pudval_t) > sizeof(long))`
`510`		`- ret = PVOP_CALLEE2(pudval_t, mmu.make_pud, val, (u64)val >> 32);`
`511`		`- else`
`512`		`- ret = PVOP_CALLEE1(pudval_t, mmu.make_pud, val);`
	`509`	`+ ret = PVOP_CALLEE1(pudval_t, mmu.make_pud, val);`
`513`	`510`
`514`	`511`	`return (pud_t) { ret };`
`515`	`512`	`}`
`516`	`513`
`517`	`514`	`static inline pudval_t pud_val(pud_t pud)`
`518`	`515`	`{`
`519`		`- pudval_t ret;`
`520`		`-`
`521`		`- if (sizeof(pudval_t) > sizeof(long))`
`522`		`- ret = PVOP_CALLEE2(pudval_t, mmu.pud_val,`
`523`		`- pud.pud, (u64)pud.pud >> 32);`
`524`		`- else`
`525`		`- ret = PVOP_CALLEE1(pudval_t, mmu.pud_val, pud.pud);`
`526`		`-`
`527`		`- return ret;`
	`516`	`+ return PVOP_CALLEE1(pudval_t, mmu.pud_val, pud.pud);`
`528`	`517`	`}`
`529`	`518`
`530`	`519`	`static inline void pud_clear(pud_t *pudp)`
`@@ -536,10 +525,7 @@ static inline void set_p4d(p4d_t *p4dp, p4d_t p4d)`
`536`	`525`	`{`
`537`	`526`	`p4dval_t val = native_p4d_val(p4d);`
`538`	`527`
`539`		`- if (sizeof(p4dval_t) > sizeof(long))`
`540`		`- PVOP_VCALL3(mmu.set_p4d, p4dp, val, (u64)val >> 32);`
`541`		`- else`
`542`		`- PVOP_VCALL2(mmu.set_p4d, p4dp, val);`
	`528`	`+ PVOP_VCALL2(mmu.set_p4d, p4dp, val);`
`543`	`529`	`}`
`544`	`530`
`545`	`531`	`#if CONFIG_PGTABLE_LEVELS >= 5`