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

* commit '7dbb1cff0b40b4f6a2792b73f24ac912cfe121d5':
  Fix the type of u_ar0 in <sys/user.h>.
This commit is contained in:
Elliott Hughes 2014-10-29 17:46:53 +00:00 committed by Android Git Automerger
commit 91e5674c34

View File

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