1 files changed, 1 insertions, 9 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 2ae5d72f47ed..1c866efd217d 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -84,7 +84,7 @@ config S390
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FTRACE_MCOUNT_RECORD
-        select HAVE_FTRACE_SYSCALLS
+        select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_DEFAULT_NO_SPIN_MUTEXES
@@ -95,7 +95,6 @@ config S390
         select HAVE_ARCH_TRACEHOOK
         select INIT_ALL_POSSIBLE
         select HAVE_PERF_COUNTERS
-        select GENERIC_ATOMIC64 if !64BIT
 
 config SCHED_OMIT_FRAME_POINTER
         bool
@@ -481,13 +480,6 @@ config CMM_IUCV
           Select this option to enable the special message interface to
           the cooperative memory management.
 
-config PAGE_STATES
-        bool "Unused page notification"
-        help
-          This enables the notification of unused pages to the
-          hypervisor. The ESSA instruction is used to do the states
-          changes between a page that has content and the unused state.
-
 config APPLDATA_BASE
         bool "Linux - VM Monitor Stream, base infrastructure"
         depends on PROC_FS