am d29c75f0: Merge "Fix x86 user_regs_struct."

* commit 'd29c75f0907f1ea57b37ddbec0a41d8739ece6d8':
  Fix x86 user_regs_struct.
This commit is contained in:
Elliott Hughes 2014-01-09 14:28:08 -08:00 committed by Android Git Automerger
commit ea7c0ea614

View File

@ -61,23 +61,23 @@ struct user_fxsr_struct {
long padding[56]; long padding[56];
}; };
struct user_regs_struct { struct user_regs_struct {
unsigned long bx; long ebx;
unsigned long cx; long ecx;
unsigned long dx; long edx;
unsigned long si; long esi;
unsigned long di; long edi;
unsigned long bp; long ebp;
unsigned long ax; long eax;
unsigned long ds; long xds;
unsigned long es; long xes;
unsigned long fs; long xfs;
unsigned long gs; long xgs;
unsigned long orig_ax; long orig_eax;
unsigned long ip; long eip;
unsigned long cs; long xcs;
unsigned long flags; long eflags;
unsigned long sp; long esp;
unsigned long ss; long xss;
}; };
struct user { struct user {
struct user_regs_struct regs; struct user_regs_struct regs;