| commit | 05c5efc204fdb7fc3ab2eddb73d9ef76d8c6ecb5 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Jan 27 21:35:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 27 21:35:38 2017 +0000 |
| tree | b0ebbea435ae731373470b0214f1a6ef3b68190f | |
| parent | a5f87c5536e27a2f30aa2cd93442900b40041438 [diff] | |
| parent | 2eb752b5a29d18ab30bcff6866b5807514b7a2c9 [diff] |
Merge "Update to kernel headers v4.9.6." am: 251a92c93f am: b1082232a3 am: 89ca923dd5 am: 2eb752b5a2 Change-Id: Id4af6c8b33a4324a86380ea4fa5d6648a545c1d6
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 @@ __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))