Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linville/wirele...

[~andy/linux] / arch / x86 / um / ptrace_64.c

diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c
index 44e68e0c0d10bf8719fa00d805d948905363ea89..3b52bf0b418acad9f0194db70f6bc6533d6f0ac8 100644 (file)
--- a/arch/x86/um/ptrace_64.c
+++ b/arch/x86/um/ptrace_64.c
@@ -30,13 +30,13 @@ static const int reg_offsets[] =
        [R15 >> 3] = HOST_R15,
        [RIP >> 3] = HOST_IP,
        [RSP >> 3] = HOST_SP,
-       [RAX >> 3] = HOST_RAX,
-       [RBX >> 3] = HOST_RBX,
-       [RCX >> 3] = HOST_RCX,
-       [RDX >> 3] = HOST_RDX,
-       [RSI >> 3] = HOST_RSI,
-       [RDI >> 3] = HOST_RDI,
-       [RBP >> 3] = HOST_RBP,
+       [RAX >> 3] = HOST_AX,
+       [RBX >> 3] = HOST_BX,
+       [RCX >> 3] = HOST_CX,
+       [RDX >> 3] = HOST_DX,
+       [RSI >> 3] = HOST_SI,
+       [RDI >> 3] = HOST_DI,
+       [RBP >> 3] = HOST_BP,
        [CS >> 3] = HOST_CS,
        [SS >> 3] = HOST_SS,
        [FS_BASE >> 3] = HOST_FS_BASE,
@@ -46,7 +46,7 @@ static const int reg_offsets[] =
        [FS >> 3] = HOST_FS,
        [GS >> 3] = HOST_GS,
        [EFLAGS >> 3] = HOST_EFLAGS,
-       [ORIG_RAX >> 3] = HOST_ORIG_RAX,
+       [ORIG_RAX >> 3] = HOST_ORIG_AX,
 };
 
 int putreg(struct task_struct *child, int regno, unsigned long value)