am df11f340: Merge "Avoid name collision with user_fpsimd_state in <asm/ptrace.h>."

* commit 'df11f340cac2e7aa5ef69c3180d0f4089f46c96b':
  Avoid name collision with user_fpsimd_state in <asm/ptrace.h>.
This commit is contained in:
Elliott Hughes 2015-06-16 02:14:40 +00:00 committed by Android Git Automerger
commit 41bc5aeb93

View File

@ -83,12 +83,12 @@ typedef struct ucontext {
typedef unsigned long greg_t; typedef unsigned long greg_t;
typedef greg_t gregset_t[NGREG]; typedef greg_t gregset_t[NGREG];
struct user_fpsimd_state { struct user_fpsimd_struct {
long double vregs[32]; long double vregs[32];
uint32_t fpsr; uint32_t fpsr;
uint32_t fpcr; uint32_t fpcr;
}; };
typedef struct user_fpsimd_state fpregset_t; typedef struct user_fpsimd_struct fpregset_t;
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
typedef struct sigcontext mcontext_t; typedef struct sigcontext mcontext_t;