ni · bstreiff · Mar 14, 2017 · Apr 5, 2012 · Apr 1, 2014 · May 19, 2014
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
@@ -451,3 +451,4 @@
 435	common	clone3				sys_clone3
 437	common	openat2				sys_openat2
 438	common	pidfd_getfd			sys_pidfd_getfd
+439	common	mcopy				sys_mcopy
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
@@ -102,7 +102,7 @@ config X86
 	select BUILDTIME_TABLE_SORT
 	select CLKEVT_I8253
 	select CLOCKSOURCE_VALIDATE_LAST_CYCLE
-	select CLOCKSOURCE_WATCHDOG
+	select HAVE_CLOCKSOURCE_WATCHDOG
 	select DCACHE_WORD_ACCESS
 	select EDAC_ATOMIC_SCRUB
 	select EDAC_SUPPORT
@@ -233,6 +233,10 @@ config X86
 	select VIRT_TO_BUS
 	select X86_FEATURE_NAMES		if PROC_FS
 	select PROC_PID_ARCH_STATUS		if PROC_FS
+	select NI_COLD_BOOT_SUPPORT
+
+config NI_COLD_BOOT_SUPPORT
+	def_bool n
 
 config INSTRUCTION_DECODER
 	def_bool y