[PATCH] fix kexec-tools options

[PATCH] fix kexec-tools options

[Maneesh Soni]

o value for OPT_REUSE_INITRD clashes with arch specific options which are
  defined as (OPT_MAX + 1), like --serial option on x86_64. Changed the
  values so that OPT_REUSE_INITRD is less than OPT_MAX.

Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>

----
--- kexec.h.orig	2007-05-15 10:06:33.000000000 +0530
+++ kexec.h	2007-05-24 17:37:34.000000000 +0530
@@ -162,8 +162,8 @@
 #define OPT_PANIC		'p'
 #define OPT_MEM_MIN             256
 #define OPT_MEM_MAX             257
-#define OPT_MAX			258
-#define OPT_REUSE_INITRD	259
+#define OPT_REUSE_INITRD	258
+#define OPT_MAX			259
 #define KEXEC_OPTIONS \
 	{ "help",		0, 0, OPT_HELP }, \
 	{ "version",		0, 0, OPT_VERSION }, \


Thanks
Maneesh

-- 
Maneesh Soni
Linux Technology Center,
IBM India Systems and Technology Lab, 
Bangalore, India

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] fix kexec-tools options

[Michael Neuling]

> o value for OPT_REUSE_INITRD clashes with arch specific options which are
>   defined as (OPT_MAX + 1), like --serial option on x86_64. Changed the
>   values so that OPT_REUSE_INITRD is less than OPT_MAX.
> 
> Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>

Oops.. thanks for fixing.

> ----
> --- kexec.h.orig	2007-05-15 10:06:33.000000000 +0530
> +++ kexec.h	2007-05-24 17:37:34.000000000 +0530

BTW the path has been stripped here, so this patch doesn't apply.  I've
fixed it up and reposted below.

Mikey


o value for OPT_REUSE_INITRD clashes with arch specific options which
  are defined as (OPT_MAX + 1), like --serial option on x86_64. Changed
  the values so that OPT_REUSE_INITRD is less than OPT_MAX.

Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Acked-by: Michael Neuling <mikey@neuling.org>
---
 kexec/kexec.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: kexec-tools-testing/kexec/kexec.h
===================================================================
--- kexec-tools-testing.orig/kexec/kexec.h
+++ kexec-tools-testing/kexec/kexec.h
@@ -162,8 +162,8 @@ extern int file_types;
 #define OPT_PANIC		'p'
 #define OPT_MEM_MIN             256
 #define OPT_MEM_MAX             257
-#define OPT_MAX			258
-#define OPT_REUSE_INITRD	259
+#define OPT_REUSE_INITRD	258
+#define OPT_MAX			259
 #define KEXEC_OPTIONS \
 	{ "help",		0, 0, OPT_HELP }, \
 	{ "version",		0, 0, OPT_VERSION }, \

_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

Re: [PATCH] fix kexec-tools options

[Horms]

On Thu, May 24, 2007 at 11:56:52PM +1000, Michael Neuling wrote:
> > o value for OPT_REUSE_INITRD clashes with arch specific options which are
> >   defined as (OPT_MAX + 1), like --serial option on x86_64. Changed the
> >   values so that OPT_REUSE_INITRD is less than OPT_MAX.
> > 
> > Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
> 
> Oops.. thanks for fixing.
> 
> > ----
> > --- kexec.h.orig	2007-05-15 10:06:33.000000000 +0530
> > +++ kexec.h	2007-05-24 17:37:34.000000000 +0530
> 
> BTW the path has been stripped here, so this patch doesn't apply.  I've
> fixed it up and reposted below.
> 
> Mikey

Thanks guys, applied.

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec