Skip to content

Commit 35cbdaf

Browse files
committed
Merge tag 'x86_paravirt_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 paravirt improvement from Borislav Petkov: - Shorten CALL insns to pvops by a byte by using rip-relative addressing * tag 'x86_paravirt_for_v5.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/paravirt: Use %rip-relative addressing in hook calls
2 parents e10821b + 2e1f8e5 commit 35cbdaf

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/x86/include/asm/paravirt_types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ extern void (*paravirt_iret)(void);
279279

280280
#define paravirt_type(op) \
281281
[paravirt_typenum] "i" (PARAVIRT_PATCH(op)), \
282-
[paravirt_opptr] "i" (&(pv_ops.op))
282+
[paravirt_opptr] "m" (pv_ops.op)
283283
#define paravirt_clobber(clobber) \
284284
[paravirt_clobber] "i" (clobber)
285285

@@ -316,7 +316,7 @@ int paravirt_disable_iospace(void);
316316
*/
317317
#define PARAVIRT_CALL \
318318
ANNOTATE_RETPOLINE_SAFE \
319-
"call *%c[paravirt_opptr];"
319+
"call *%[paravirt_opptr];"
320320

321321
/*
322322
* These macros are intended to wrap calls through one of the paravirt

0 commit comments

Comments
 (0)