diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-18 21:34:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 21:34:30 +0000 |
| commit | 0de034a4ab74ecf1cab41e58f0e8aa92551141bf (patch) | |
| tree | 5daa59d071f9480e7db81d295d0e596f02abe479 | |
| parent | e3aa32726e5258ae2039c39814e0f2909da1fa5d (diff) | |
| parent | 10bd5226ca7d1d478c8dd0bcf826786e8a846052 (diff) | |
| download | kernel-headers-0de034a4ab74ecf1cab41e58f0e8aa92551141bf.tar.gz | |
Merge "Move to v3.16.3 kernel headers."
| -rw-r--r-- | original/uapi/asm-arm/asm/unistd.h | 11 | ||||
| -rw-r--r-- | original/uapi/linux/version.h | 2 | ||||
| -rw-r--r-- | original/uapi/rdma/rdma_user_cm.h | 1 |
3 files changed, 2 insertions, 12 deletions
diff --git a/original/uapi/asm-arm/asm/unistd.h b/original/uapi/asm-arm/asm/unistd.h index ba94446..acd5b66 100644 --- a/original/uapi/asm-arm/asm/unistd.h +++ b/original/uapi/asm-arm/asm/unistd.h @@ -411,11 +411,6 @@ #define __NR_renameat2 (__NR_SYSCALL_BASE+382) /* - * This may need to be greater than __NR_last_syscall+1 in order to - * account for the padding in the syscall table - */ - -/* * The following SWIs are ARM private. */ #define __ARM_NR_BASE (__NR_SYSCALL_BASE+0x0f0000) @@ -426,12 +421,6 @@ #define __ARM_NR_set_tls (__ARM_NR_BASE+5) /* - * *NOTE*: This is a ghost syscall private to the kernel. Only the - * __kuser_cmpxchg code in entry-armv.S should be aware of its - * existence. Don't ever use this from user code. - */ - -/* * The following syscalls are obsolete and no longer available for EABI. */ #if !defined(__KERNEL__) diff --git a/original/uapi/linux/version.h b/original/uapi/linux/version.h index e7af79f..0a220ed 100644 --- a/original/uapi/linux/version.h +++ b/original/uapi/linux/version.h @@ -1,2 +1,2 @@ -#define LINUX_VERSION_CODE 200705 +#define LINUX_VERSION_CODE 200707 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) diff --git a/original/uapi/rdma/rdma_user_cm.h b/original/uapi/rdma/rdma_user_cm.h index 99b80ab..3066718 100644 --- a/original/uapi/rdma/rdma_user_cm.h +++ b/original/uapi/rdma/rdma_user_cm.h @@ -34,6 +34,7 @@ #define RDMA_USER_CM_H #include <linux/types.h> +#include <linux/socket.h> #include <linux/in6.h> #include <rdma/ib_user_verbs.h> #include <rdma/ib_user_sa.h> |