Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / arch / x86 / um / user-offsets.c

diff --git a/arch/x86/um/user-offsets.c b/arch/x86/um/user-offsets.c
index 3c19c48a1d4869dd348f948da15bcfd273cf54fb..ca49be8ddd0c7160821a4d4db06f18346f52b195 100644 (file)
--- a/arch/x86/um/user-offsets.c
+++ b/arch/x86/um/user-offsets.c
@@ -23,28 +23,29 @@ void foo(void)
        DEFINE(HOST_IP, EIP);
        DEFINE(HOST_SP, UESP);
        DEFINE(HOST_EFLAGS, EFL);
-       DEFINE(HOST_EAX, EAX);
-       DEFINE(HOST_EBX, EBX);
-       DEFINE(HOST_ECX, ECX);
-       DEFINE(HOST_EDX, EDX);
-       DEFINE(HOST_ESI, ESI);
-       DEFINE(HOST_EDI, EDI);
-       DEFINE(HOST_EBP, EBP);
+       DEFINE(HOST_AX, EAX);
+       DEFINE(HOST_BX, EBX);
+       DEFINE(HOST_CX, ECX);
+       DEFINE(HOST_DX, EDX);
+       DEFINE(HOST_SI, ESI);
+       DEFINE(HOST_DI, EDI);
+       DEFINE(HOST_BP, EBP);
        DEFINE(HOST_CS, CS);
        DEFINE(HOST_SS, SS);
        DEFINE(HOST_DS, DS);
        DEFINE(HOST_FS, FS);
        DEFINE(HOST_ES, ES);
        DEFINE(HOST_GS, GS);
+       DEFINE(HOST_ORIG_AX, ORIG_EAX);
 #else
        DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long));
-       DEFINE_LONGS(HOST_RBX, RBX);
-       DEFINE_LONGS(HOST_RCX, RCX);
-       DEFINE_LONGS(HOST_RDI, RDI);
-       DEFINE_LONGS(HOST_RSI, RSI);
-       DEFINE_LONGS(HOST_RDX, RDX);
-       DEFINE_LONGS(HOST_RBP, RBP);
-       DEFINE_LONGS(HOST_RAX, RAX);
+       DEFINE_LONGS(HOST_BX, RBX);
+       DEFINE_LONGS(HOST_CX, RCX);
+       DEFINE_LONGS(HOST_DI, RDI);
+       DEFINE_LONGS(HOST_SI, RSI);
+       DEFINE_LONGS(HOST_DX, RDX);
+       DEFINE_LONGS(HOST_BP, RBP);
+       DEFINE_LONGS(HOST_AX, RAX);
        DEFINE_LONGS(HOST_R8, R8);
        DEFINE_LONGS(HOST_R9, R9);
        DEFINE_LONGS(HOST_R10, R10);
@@ -53,7 +54,7 @@ void foo(void)
        DEFINE_LONGS(HOST_R13, R13);
        DEFINE_LONGS(HOST_R14, R14);
        DEFINE_LONGS(HOST_R15, R15);
-       DEFINE_LONGS(HOST_ORIG_RAX, ORIG_RAX);
+       DEFINE_LONGS(HOST_ORIG_AX, ORIG_RAX);
        DEFINE_LONGS(HOST_CS, CS);
        DEFINE_LONGS(HOST_SS, SS);
        DEFINE_LONGS(HOST_EFLAGS, EFLAGS);