Jan Beulich
2006-Oct-04 15:11 UTC
[Xen-devel] [PATCH] x86: remove references to non-existing 7th multi call argument
.. and a needless use of the STR() macro.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: 2006-09-21/xen/arch/x86/x86_32/asm-offsets.c
==================================================================---
2006-09-21.orig/xen/arch/x86/x86_32/asm-offsets.c 2006-09-25 14:58:07.000000000
+0200
+++ 2006-09-21/xen/arch/x86/x86_32/asm-offsets.c 2006-09-25 14:59:27.000000000
+0200
@@ -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();
Index: 2006-09-21/xen/arch/x86/x86_64/asm-offsets.c
==================================================================---
2006-09-21.orig/xen/arch/x86/x86_64/asm-offsets.c 2006-09-25 14:58:19.000000000
+0200
+++ 2006-09-21/xen/arch/x86/x86_64/asm-offsets.c 2006-09-25 14:59:15.000000000
+0200
@@ -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();
Index: 2006-09-21/xen/include/asm-x86/multicall.h
==================================================================---
2006-09-21.orig/xen/include/asm-x86/multicall.h 2006-09-25 14:58:07.000000000
+0200
+++ 2006-09-21/xen/include/asm-x86/multicall.h 2006-09-25 15:00:39.000000000
+0200
@@ -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; "
\
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel