From 583a399732e6985bff19434cb95d42b078f9d35a Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Wed, 5 Apr 2017 15:28:41 +0300 Subject: [PATCH] Update criu/include/linux/userfaultfd.h This is the version from v4.11-rc5. Apparently, that would be the userfault ABI for the next few month. Signed-off-by: Mike Rapoport Signed-off-by: Andrei Vagin --- criu/cr-check.c | 1 - criu/include/linux/userfaultfd.h | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/criu/cr-check.c b/criu/cr-check.c index dfe3a50ee..46ab6f1a9 100644 --- a/criu/cr-check.c +++ b/criu/cr-check.c @@ -1049,7 +1049,6 @@ static int check_compat_cr(void) static int check_uffd(void) { unsigned long features = UFFD_FEATURE_EVENT_FORK | - UFFD_FEATURE_EVENT_EXIT | UFFD_FEATURE_EVENT_REMAP | UFFD_FEATURE_EVENT_UNMAP | UFFD_FEATURE_EVENT_REMOVE; diff --git a/criu/include/linux/userfaultfd.h b/criu/include/linux/userfaultfd.h index c055947c5..3b059530d 100644 --- a/criu/include/linux/userfaultfd.h +++ b/criu/include/linux/userfaultfd.h @@ -18,8 +18,7 @@ * means the userland is reading). */ #define UFFD_API ((__u64)0xAA) -#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_EXIT | \ - UFFD_FEATURE_EVENT_FORK | \ +#define UFFD_API_FEATURES (UFFD_FEATURE_EVENT_FORK | \ UFFD_FEATURE_EVENT_REMAP | \ UFFD_FEATURE_EVENT_REMOVE | \ UFFD_FEATURE_EVENT_UNMAP | \ @@ -113,7 +112,6 @@ struct uffd_msg { #define UFFD_EVENT_REMAP 0x14 #define UFFD_EVENT_REMOVE 0x15 #define UFFD_EVENT_UNMAP 0x16 -#define UFFD_EVENT_EXIT 0x17 /* flags for UFFD_EVENT_PAGEFAULT */ #define UFFD_PAGEFAULT_FLAG_WRITE (1<<0) /* If this was a write fault */ @@ -163,7 +161,6 @@ struct uffdio_api { #define UFFD_FEATURE_MISSING_HUGETLBFS (1<<4) #define UFFD_FEATURE_MISSING_SHMEM (1<<5) #define UFFD_FEATURE_EVENT_UNMAP (1<<6) -#define UFFD_FEATURE_EVENT_EXIT (1<<7) __u64 features; __u64 ioctls;