am 021b6412: Merge "Fix the type of u_ar0 in <sys/user.h>."

* commit '021b6412f7b7ce73b383480b25a8e5d69323f78c':
  Fix the type of u_ar0 in <sys/user.h>.
This commit is contained in:
Elliott Hughes 2014-10-28 19:28:34 +00:00 committed by Android Git Automerger
commit 7dbb1cff0b

View File

@ -91,7 +91,7 @@ struct user {
unsigned long start_stack;
long int signal;
int reserved;
unsigned long u_ar0;
struct user_regs_struct* u_ar0;
struct user_fpregs_struct* u_fpstate;
unsigned long magic;
char u_comm[32];
@ -155,7 +155,7 @@ struct user {
long int signal;
int reserved;
int pad1;
unsigned long u_ar0;
struct user_regs_struct* u_ar0;
struct user_fpregs_struct* u_fpstate;
unsigned long magic;
char u_comm[32];
@ -175,7 +175,7 @@ struct user {
unsigned long start_data;
unsigned long start_stack;
long int signal;
unsigned long u_ar0;
void* u_ar0;
unsigned long magic;
char u_comm[32];
};