History

Merge branch 'for-4.4/core' into for-4.4/drivers

Jens Axboe committed 11 years ago

Commit 54ef2b92 parents f7e7868 fd48ca3690 files · +7245 −3959Browse files

Showing the changes to include/uapi (3 of 690 files). Show all

Unified · Split

3 files
  1. include/uapi/asm-generic/unistd.h +5 −3
  2. include/uapi/linux/lwtunnel.h +0 −4
  3. include/uapi/linux/userfaultfd.h +0 −2
include/uapi/asm-generic/unistd.h+5−3
@@ -709,17 +709,19 @@ __SYSCALL(__NR_memfd_create, sys_memfd_create) · 708 unmodified lines
709__SYSCALL(__NR_bpf, sys_bpf)709__SYSCALL(__NR_bpf, sys_bpf)
710#define __NR_execveat 281710#define __NR_execveat 281
711__SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)711__SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
712#define __NR_membarrier 282712#define __NR_userfaultfd 282
713__SYSCALL(__NR_userfaultfd, sys_userfaultfd)
714#define __NR_membarrier 283
713__SYSCALL(__NR_membarrier, sys_membarrier)715__SYSCALL(__NR_membarrier, sys_membarrier)
714 716
715#undef __NR_syscalls717#undef __NR_syscalls
716#define __NR_syscalls 283718#define __NR_syscalls 284
717 719
718/*720/*
719 * All syscalls below here should go away really,721 * All syscalls below here should go away really,
720 * these are provided for both review and as a porting722 * these are provided for both review and as a porting
721 * help for the C library version.723 * help for the C library version.
722*724 *
723 * Last chance: are any of these important enough to725 * Last chance: are any of these important enough to
724 * enable by default?726 * enable by default?
725 */727 */
include/uapi/linux/lwtunnel.h+0−4
@@ -21,8 +21,6 @@ enum lwtunnel_ip_t { · 20 unmodified lines
21 LWTUNNEL_IP_SRC,21 LWTUNNEL_IP_SRC,
22 LWTUNNEL_IP_TTL,22 LWTUNNEL_IP_TTL,
23 LWTUNNEL_IP_TOS,23 LWTUNNEL_IP_TOS,
24 LWTUNNEL_IP_SPORT,
25 LWTUNNEL_IP_DPORT,
26 LWTUNNEL_IP_FLAGS,24 LWTUNNEL_IP_FLAGS,
27 __LWTUNNEL_IP_MAX,25 __LWTUNNEL_IP_MAX,
28};26};
@@ -36,8 +34,6 @@ enum lwtunnel_ip6_t { · 7 unmodified lines
36 LWTUNNEL_IP6_SRC,34 LWTUNNEL_IP6_SRC,
37 LWTUNNEL_IP6_HOPLIMIT,35 LWTUNNEL_IP6_HOPLIMIT,
38 LWTUNNEL_IP6_TC,36 LWTUNNEL_IP6_TC,
39 LWTUNNEL_IP6_SPORT,
40 LWTUNNEL_IP6_DPORT,
41 LWTUNNEL_IP6_FLAGS,37 LWTUNNEL_IP6_FLAGS,
42 __LWTUNNEL_IP6_MAX,38 __LWTUNNEL_IP6_MAX,
43};39};
include/uapi/linux/userfaultfd.h+0−2
@@ -11,8 +11,6 @@ · 10 unmodified lines
11 11
12#include <linux/types.h>12#include <linux/types.h>
13 13
14#include <linux/compiler.h>
15
16#define UFFD_API ((__u64)0xAA)14#define UFFD_API ((__u64)0xAA)
17/*15/*
18 * After implementing the respective features it will become:16 * After implementing the respective features it will become: