[CRIU] [PATCH v2 1/7] UFFD related makefiles cleanup

[Mike Rapoport]

Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
 criu/Makefile.config  | 10 +---------
 criu/Makefile.crtools |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/criu/Makefile.config b/criu/Makefile.config
index 326356e..32543b4 100644
--- a/criu/Makefile.config
+++ b/criu/Makefile.config
@@ -14,12 +14,8 @@ ifeq ($(call pkg-config-check,libselinux),y)
         DEFINES	+= -DCONFIG_HAS_SELINUX
 endif
 
-ifeq ($(call try-cc,$(FEATURE_TEST_UFFD)),y)
-	export UFFD := 1
-endif
-
 FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
-	SETPROCTITLE_INIT MEMFD
+	SETPROCTITLE_INIT MEMFD UFFD
 
 # $1 - config name
 define gen-feature-test
@@ -42,10 +38,6 @@ ifeq ($$(VDSO),y)
 	$(Q) @echo '#define CONFIG_VDSO'				>> $$@
 	$(Q) @echo ''							>> $$@
 endif
-ifeq ($$(UFFD),1)
-	$(Q) @echo '#define CONFIG_HAS_UFFD'				>> $$@
-	$(Q) @echo ''							>> $$@
-endif
 ifeq ($$(piegen-y),y)
 	$(Q) @echo '#define CONFIG_PIEGEN'				>> $$@
 	$(Q) @echo ''							>> $$@
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 79fd77a..ec064ba 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -76,14 +76,13 @@ obj-y			+= tun.o
 obj-y			+= util.o
 obj-y			+= uts_ns.o
 obj-y			+= autofs.o
+obj-y	+= uffd.o
 
 ifeq ($(VDSO),y)
 obj-y			+= pie-util-vdso.o
 obj-y			+= vdso.o
 endif
 
-obj-y	+= uffd.o
-
 PROTOBUF_GEN := $(SRC_DIR)/scripts/protobuf-gen.sh
 
 protobuf-desc.c: protobuf-desc-gen.h
-- 
1.9.1