From 622021cd6c560ce7aaaf7294a732177a30c9d65f Mon Sep 17 00:00:00 2001 From: Sven Schnelle Date: Wed, 29 Sep 2021 09:09:34 +0200 Subject: [PATCH] s390: make command line configurable Allow to configure the command line to an arbitrary length, with a default of 4096 bytes. Also remove COMMAND_LINE_SIZE from include/uapi/asm/setup.h as this is dynamic now and doesn't tell anything about the command line size limitations of a new kernel that might be loaded. Signed-off-by: Sven Schnelle Reviewed-by: Heiko Carstens Signed-off-by: Vasily Gorbik --- arch/s390/Kconfig | 8 ++++++++ arch/s390/include/asm/setup.h | 1 + arch/s390/include/uapi/asm/setup.h | 11 ----------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index d0d42c5c41416..8857ec3b97eb8 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 d718029794e2c..77e6506898f53 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 9b685536c31c3..598d769e76df0 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 */