aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2010-12-15 12:13:47 +0000
committerKeir Fraser <keir@xen.org>2010-12-15 12:13:47 +0000
commit8ede95b56f82a3f82dc8eae7a2f7b7423b95a777 (patch)
treec45891159dab51e3b11378f03a4c0e1b88b08d08
parent0ab088ce6d79a2922fb246eb3266b157acf64ac9 (diff)
downloadxen-8ede95b56f82a3f82dc8eae7a2f7b7423b95a777.tar.gz
xen-8ede95b56f82a3f82dc8eae7a2f7b7423b95a777.tar.bz2
xen-8ede95b56f82a3f82dc8eae7a2f7b7423b95a777.zip
x86-64: fix restoring of hypercall arguments after trace callout
Signed-off-by: Jan Beulich <jbeulich@novell.com> xen-unstable changeset: 22539:20c65aa19075 xen-unstable date: Wed Dec 15 12:09:41 2010 +0000
-rw-r--r--xen/arch/x86/x86_64/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 0558ba8ede..a579e60868 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -171,8 +171,8 @@ ENTRY(syscall_enter)
movq UREGS_rsi+SHADOW_BYTES(%rsp),%rsi /* Arg 2 */
movq UREGS_rdx+SHADOW_BYTES(%rsp),%rdx /* Arg 3 */
movq UREGS_r10+SHADOW_BYTES(%rsp),%rcx /* Arg 4 */
- movq UREGS_rdi+SHADOW_BYTES(%rsp),%r8 /* Arg 5 */
- movq UREGS_rbp+SHADOW_BYTES(%rsp),%r9 /* Arg 6 */
+ movq UREGS_r8 +SHADOW_BYTES(%rsp),%r8 /* Arg 5 */
+ movq UREGS_r9 +SHADOW_BYTES(%rsp),%r9 /* Arg 6 */
#undef SHADOW_BYTES
1: leaq hypercall_table(%rip),%r10
PERFC_INCR(PERFC_hypercalls, %rax, %rbx)