diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index d0d42c5c41416158992e7095535588438255fa73..8857ec3b97eb887d4bc78ecc8462b942b2b62071 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -438,6 +438,14 @@ endchoice
 config 64BIT
 	def_bool y
 
+config COMMAND_LINE_SIZE
+	int "Maximum size of kernel command line"
+	default 4096
+	range 896 1048576
+	help
+	  This allows you to specify the maximum length of the kernel command
+	  line.
+
 config COMPAT
 	def_bool y
 	prompt "Kernel support for 31 bit emulation"
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index d718029794e2c88ffc4db400203df30fe629f1cd..77e6506898f53d40bc4cad1bc830c0089e3e8f4f 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -12,6 +12,7 @@
 
 #define PARMAREA		0x10400
 
+#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE
 /*
  * Machine features detected in early.c
  */
diff --git a/arch/s390/include/uapi/asm/setup.h b/arch/s390/include/uapi/asm/setup.h
index 9b685536c31c31d8de5615190d7b219051d366a3..598d769e76df0fb7aca3e9fe92051899349bf7f8 100644
--- a/arch/s390/include/uapi/asm/setup.h
+++ b/arch/s390/include/uapi/asm/setup.h
@@ -1,12 +1 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- *  S390 version
- *    Copyright IBM Corp. 1999, 2010
- */
-
-#ifndef _UAPI_ASM_S390_SETUP_H
-#define _UAPI_ASM_S390_SETUP_H
-
-#define COMMAND_LINE_SIZE	4096
-
-#endif /* _UAPI_ASM_S390_SETUP_H */