diff options
author | Christopher Ferris <cferris@google.com> | 2017-01-27 21:30:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-27 21:30:38 +0000 |
commit | 89ca923dd54cb88648c3b031617aed096bf399a0 (patch) | |
tree | b0ebbea435ae731373470b0214f1a6ef3b68190f | |
parent | 732b4a7bf7e15be11338371bb25d8d391e1d74e8 (diff) | |
parent | b1082232a354758c03660e806a7c88309497daae (diff) | |
download | kernel-headers-89ca923dd54cb88648c3b031617aed096bf399a0.tar.gz |
Merge "Update to kernel headers v4.9.6." am: 251a92c93f
am: b1082232a3
Change-Id: I3c5762180d4917ea282fba391c8bdc3fb16b2f85
-rw-r--r-- | original/uapi/asm-arm64/asm/ptrace.h | 1 | ||||
-rw-r--r-- | original/uapi/linux/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/original/uapi/asm-arm64/asm/ptrace.h b/original/uapi/asm-arm64/asm/ptrace.h index b5c3933..d1ff83d 100644 --- a/original/uapi/asm-arm64/asm/ptrace.h +++ b/original/uapi/asm-arm64/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 { diff --git a/original/uapi/linux/version.h b/original/uapi/linux/version.h index b3e1646..1fe7e50 100644 --- a/original/uapi/linux/version.h +++ b/original/uapi/linux/version.h @@ -1,2 +1,2 @@ -#define LINUX_VERSION_CODE 264451 +#define LINUX_VERSION_CODE 264454 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |