diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 48af970320cb..2784ca96f418 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -142,7 +142,6 @@ config S390
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_DYNAMIC_FTRACE_WITH_REGS
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
-	select HAVE_EXIT_THREAD
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_FUNCTION_TRACER
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 0ecadd349106..080c851dd9a5 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -43,13 +43,6 @@ asmlinkage void ret_from_fork(void) asm ("ret_from_fork");
 
 extern void kernel_thread_starter(void);
 
-/*
- * Free current thread data structures etc..
- */
-void exit_thread(struct task_struct *tsk)
-{
-}
-
 void flush_thread(void)
 {
 }