commit 38062f954c637861348dd8078cefb73554e6f12c
author Christopher Ferris <cferris@google.com> Wed Jul 09 15:33:25 2014 -0700
committer Christopher Ferris <cferris@google.com> Thu Jul 10 13:32:32 2014 -0700
tree 5fef4bcbf86fc780ac83ee0e2ab2f0f6cdfc9408
parent 4c199170a84e725a56b7d40c113c9d76a75d89ab

Update kernel headers to v3.14.

Other changes:
- Modify update_all.py to skip ion header files when importing into aosp.
- Fix generate_uapi_headers.sh to handle imports from a linux-stable kernel.

Change-Id: I1ad81b9ccb063c21740f9875f2cc1238052cd4b3

libc/kernel/uapi/asm-generic/socket.h

diff --git a/libc/kernel/uapi/asm-generic/socket.h b/libc/kernel/uapi/asm-generic/socket.h
index 997db00..93daf83 100644
--- a/libc/kernel/uapi/asm-generic/socket.h
+++ b/libc/kernel/uapi/asm-generic/socket.h
@@ -86,4 +86,8 @@
 #define SO_LOCK_FILTER 44
 #define SO_SELECT_ERR_QUEUE 45
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#define SO_BUSY_POLL 46
+#define SO_MAX_PACING_RATE 47
+#define SO_BPF_EXTENSIONS 48
 #endif
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */