[Xen-changelog] [xen-unstable] [XEN] Remove unused MULTICALL_arg6, and unnecessary use of STR() macro.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID eee52c100996efd39fb3f9bc7b43c75808927f2a
# Parent  56fe7bbcbeaf76d6e7f98b68b6cc3c233ce4bdf9
[XEN] Remove unused MULTICALL_arg6, and unnecessary use of STR() macro.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/x86_32/asm-offsets.c |    1 -
 xen/arch/x86/x86_64/asm-offsets.c |    1 -
 xen/include/asm-x86/multicall.h   |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff -r 56fe7bbcbeaf -r eee52c100996 xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Thu Oct 05 16:35:56 2006 +0100
+++ b/xen/arch/x86/x86_32/asm-offsets.c Thu Oct 05 16:36:39 2006 +0100
@@ -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();
 
diff -r 56fe7bbcbeaf -r eee52c100996 xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Thu Oct 05 16:35:56 2006 +0100
+++ b/xen/arch/x86/x86_64/asm-offsets.c Thu Oct 05 16:36:39 2006 +0100
@@ -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();
 
diff -r 56fe7bbcbeaf -r eee52c100996 xen/include/asm-x86/multicall.h
--- a/xen/include/asm-x86/multicall.h   Thu Oct 05 16:35:56 2006 +0100
+++ b/xen/include/asm-x86/multicall.h   Thu Oct 05 16:36:39 2006 +0100
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog