diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-05 16:36:39 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-05 16:36:39 +0100 |
| commit | 86c981c50cb7e01055adad91fefdb72571f7c1c7 (patch) | |
| tree | 38bb5b88113976a224fd6e5cfcf06b6f8f81aade | |
| parent | 39e9688348db77a63cb189fbbad5c4d61412b063 (diff) | |
| download | xen-86c981c50cb7e01055adad91fefdb72571f7c1c7.tar.gz xen-86c981c50cb7e01055adad91fefdb72571f7c1c7.tar.bz2 xen-86c981c50cb7e01055adad91fefdb72571f7c1c7.zip | |
[XEN] Remove unused MULTICALL_arg6, and unnecessary use of STR() macro.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
| -rw-r--r-- | xen/arch/x86/x86_32/asm-offsets.c | 1 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/asm-offsets.c | 1 | ||||
| -rw-r--r-- | xen/include/asm-x86/multicall.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c index 3a994650ca..36197ef9e8 100644 --- a/xen/arch/x86/x86_32/asm-offsets.c +++ b/xen/arch/x86/x86_32/asm-offsets.c @@ -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 --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c index 6744e6c9e2..5e95815678 100644 --- a/xen/arch/x86/x86_64/asm-offsets.c +++ b/xen/arch/x86/x86_64/asm-offsets.c @@ -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 --git a/xen/include/asm-x86/multicall.h b/xen/include/asm-x86/multicall.h index 5fe37176fa..1ce7866c3e 100644 --- a/xen/include/asm-x86/multicall.h +++ b/xen/include/asm-x86/multicall.h @@ -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; " \ |