Merge "Update to kernel headers v4.9.6." am: 6a9e0c8f15

am: 553293dd96

Change-Id: Id0c472fe933d57418539f5ac091bf2d9e88cc0cd
This commit is contained in:
Christopher Ferris 2017-01-27 21:17:10 +00:00 committed by android-build-merger
commit fcbe1b780f
2 changed files with 6 additions and 4 deletions

View file

@ -64,18 +64,20 @@ struct user_fpsimd_state {
__uint128_t vregs[32];
__u32 fpsr;
__u32 fpcr;
};
__u32 __reserved[2];
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
};
struct user_hwdebug_state {
__u32 dbg_info;
__u32 pad;
struct {
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
struct {
__u64 addr;
__u32 ctrl;
__u32 pad;
} dbg_regs[16];
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
} dbg_regs[16];
};
#endif
#endif
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

View file

@ -16,5 +16,5 @@
***
****************************************************************************
****************************************************************************/
#define LINUX_VERSION_CODE 264451
#define LINUX_VERSION_CODE 264454
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))