x86: remove references to non-existing 7th multi call argument
PATCH 1/1 x86: remove references to non-existing 7th multi call argument
.. and a needless use of the STR() macro.
Signed-off-by Jan Beulich <[email protected]>
xen/arch/x86/x86_32/asm-offsets.c +0 -1
@@ -118,7 +118,6 @@ void __dummy__(void) OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]); OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]); OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]); - OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]); OFFSET(MULTICALL_result, struct multicall_entry, result);BLANK ();
xen/arch/x86/x86_64/asm-offsets.c +0 -1
@@ -112,7 +112,6 @@ void __dummy__(void) OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]); OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]); OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]); - OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]); OFFSET(MULTICALL_result, struct multicall_entry, result);BLANK ();
xen/include/asm-x86/multicall.h +1 -1
@@ -16,7 +16,7 @@ " movq "STR(MULTICALL_op)"(%0),%%rax; " \ " cmpq $("STR(NR_hypercalls)"),%%rax; " \" jae 2f; " \ - " leaq "STR(hypercall_table)"(%%rip),%%rdi; "\ +" leaq hypercall_table(%%rip),%%rdi; " \" leaq (%%rdi,%%rax,8),%%rax; " \ " movq "STR(MULTICALL_arg0)"(%0),%%rdi; " \ " movq "STR(MULTICALL_arg1)"(%0),%%rsi; " \