summaryrefslogtreecommitdiff
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2017-01-26 13:42:20 -0800
committerDmitry Shmidt <dimitrysh@google.com>2017-01-26 13:42:20 -0800
commite9a82a4cbe64b78d72c3adaea73352d2b9bab895 (patch)
tree91f1fecb1dbb7d5aba8eb4dd863756b0b0b70fd0 /arch/arm64/include
parentbd2cd20990bf3d7b47c832e1288dbb8ee73e8bdf (diff)
parentef30573ef2b13c0ecbd0302ee00b6921cf0a4aa0 (diff)
Merge tag 'v4.4.45' into android-4.4.y
This is the 4.4.45 stable release
Diffstat (limited to 'arch/arm64/include')
-rw-r--r--arch/arm64/include/uapi/asm/ptrace.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
index b5c3933ed441..d1ff83dfe5de 100644
--- a/arch/arm64/include/uapi/asm/ptrace.h
+++ b/arch/arm64/include/uapi/asm/ptrace.h
@@ -77,6 +77,7 @@ struct user_fpsimd_state {
__uint128_t vregs[32];
__u32 fpsr;
__u32 fpcr;
+ __u32 __reserved[2];
};
struct user_hwdebug_state {