ia64/xen-unstable

changeset 11756:eee52c100996

[XEN] Remove unused MULTICALL_arg6, and unnecessary use of STR() macro.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Thu Oct 05 16:36:39 2006 +0100 (2006-10-05)
parents 56fe7bbcbeaf
children 609b10b17bf0
files xen/arch/x86/x86_32/asm-offsets.c xen/arch/x86/x86_64/asm-offsets.c xen/include/asm-x86/multicall.h
line diff
     1.1 --- a/xen/arch/x86/x86_32/asm-offsets.c	Thu Oct 05 16:35:56 2006 +0100
     1.2 +++ b/xen/arch/x86/x86_32/asm-offsets.c	Thu Oct 05 16:36:39 2006 +0100
     1.3 @@ -118,7 +118,6 @@ void __dummy__(void)
     1.4      OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]);
     1.5      OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]);
     1.6      OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]);
     1.7 -    OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]);
     1.8      OFFSET(MULTICALL_result, struct multicall_entry, result);
     1.9      BLANK();
    1.10  
     2.1 --- a/xen/arch/x86/x86_64/asm-offsets.c	Thu Oct 05 16:35:56 2006 +0100
     2.2 +++ b/xen/arch/x86/x86_64/asm-offsets.c	Thu Oct 05 16:36:39 2006 +0100
     2.3 @@ -112,7 +112,6 @@ void __dummy__(void)
     2.4      OFFSET(MULTICALL_arg3, struct multicall_entry, args[3]);
     2.5      OFFSET(MULTICALL_arg4, struct multicall_entry, args[4]);
     2.6      OFFSET(MULTICALL_arg5, struct multicall_entry, args[5]);
     2.7 -    OFFSET(MULTICALL_arg6, struct multicall_entry, args[6]);
     2.8      OFFSET(MULTICALL_result, struct multicall_entry, result);
     2.9      BLANK();
    2.10  
     3.1 --- a/xen/include/asm-x86/multicall.h	Thu Oct 05 16:35:56 2006 +0100
     3.2 +++ b/xen/include/asm-x86/multicall.h	Thu Oct 05 16:36:39 2006 +0100
     3.3 @@ -16,7 +16,7 @@
     3.4              "    movq  "STR(MULTICALL_op)"(%0),%%rax; "      \
     3.5              "    cmpq  $("STR(NR_hypercalls)"),%%rax; "      \
     3.6              "    jae   2f; "                                 \
     3.7 -            "    leaq  "STR(hypercall_table)"(%%rip),%%rdi; "\
     3.8 +            "    leaq  hypercall_table(%%rip),%%rdi; "       \
     3.9              "    leaq  (%%rdi,%%rax,8),%%rax; "              \
    3.10              "    movq  "STR(MULTICALL_arg0)"(%0),%%rdi; "    \
    3.11              "    movq  "STR(MULTICALL_arg1)"(%0),%%rsi; "    \