commit 91a3d0e00a5c18ee9bdd2c6c03ac64a6471e2559

 Author: Sven Schnelle <svens@linux.ibm.com>

 Date:   Thu Dec 16 12:43:53 2021 +0100

     s390: use KEXEC_ALL_OPTIONS

     KEXEC_ALL_OPTIONS could be used instead defining the same

     array several times. This makes code easier to maintain when

     new options are added.

     Suggested-by: Alexander Egorenkov <egorenar@linux.ibm.com>

     Signed-off-by: Sven Schnelle <svens@linux.ibm.com>

     Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>

     Signed-off-by: Simon Horman <horms@verge.net.au>

 diff --git a/kexec/arch/s390/kexec-image.c b/kexec/arch/s390/kexec-image.c

 index a52399eafd2abd4a24142f0512251598ea812ca5..209ab77ddccbd60f10989e2d9fc273324aefa76d 100644

 --- a/kexec/arch/s390/kexec-image.c

 +++ b/kexec/arch/s390/kexec-image.c

 @@ -57,10 +57,7 @@ int image_s390_load_file(int argc, char **argv, struct kexec_info *info)

  	static const struct option options[] =

  		{

 -			KEXEC_OPTIONS

 -			{"command-line",     1, 0, OPT_APPEND},

 -			{"append",           1, 0, OPT_APPEND},

 -			{"initrd",           1, 0, OPT_RAMDISK},

 +			KEXEC_ALL_OPTIONS

  			{0,                  0, 0, 0},

  		};

  	static const char short_options[] = KEXEC_OPT_STR "";

 @@ -111,10 +108,7 @@ image_s390_load(int argc, char **argv, const char *kernel_buf,

  	static const struct option options[] =

  		{

 -			KEXEC_OPTIONS

 -			{"command-line",     1, 0, OPT_APPEND},

 -			{"append",           1, 0, OPT_APPEND},

 -			{"initrd",           1, 0, OPT_RAMDISK},

 +			KEXEC_ALL_OPTIONS

  			{0,                  0, 0, 0},

  		};

  	static const char short_options[] = KEXEC_OPT_STR "";