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
709709 __SYSCALL(__NR_bpf, sys_bpf)
710710 #define __NR_execveat 281
711711 __SC_COMP(__NR_execveat, sys_execveat, compat_sys_execveat)
712−#define __NR_membarrier 282
712+#define __NR_userfaultfd 282
713+__SYSCALL(__NR_userfaultfd, sys_userfaultfd)
714+#define __NR_membarrier 283
713715 __SYSCALL(__NR_membarrier, sys_membarrier)
714716
715717 #undef __NR_syscalls
716−#define __NR_syscalls 283
718+#define __NR_syscalls 284
717719
718720 /*
719721 * All syscalls below here should go away really,
720722 * these are provided for both review and as a porting
721723 * help for the C library version.
722−*
724+ *
723725 * Last chance: are any of these important enough to
724726 * enable by default?
725727 */
include/uapi/linux/lwtunnel.h+0−4
@@ -21,8 +21,6 @@ enum lwtunnel_ip_t { · 20 unmodified lines
2121 LWTUNNEL_IP_SRC,
2222 LWTUNNEL_IP_TTL,
2323 LWTUNNEL_IP_TOS,
24− LWTUNNEL_IP_SPORT,
25− LWTUNNEL_IP_DPORT,
2624 LWTUNNEL_IP_FLAGS,
2725 __LWTUNNEL_IP_MAX,
2826 };
@@ -36,8 +34,6 @@ enum lwtunnel_ip6_t { · 7 unmodified lines
3634 LWTUNNEL_IP6_SRC,
3735 LWTUNNEL_IP6_HOPLIMIT,
3836 LWTUNNEL_IP6_TC,
39− LWTUNNEL_IP6_SPORT,
40− LWTUNNEL_IP6_DPORT,
4137 LWTUNNEL_IP6_FLAGS,
4238 __LWTUNNEL_IP6_MAX,
4339 };
include/uapi/linux/userfaultfd.h+0−2
@@ -11,8 +11,6 @@ · 10 unmodified lines
1111
1212 #include <linux/types.h>
1313
14−#include <linux/compiler.h>
15−
1614 #define UFFD_API ((__u64)0xAA)
1715 /*
1816 * After implementing the respective features it will become: