Skip to contentSkip to conversation

fix kexec-tools options

PATCH In review Maneesh Soni 3 participants 3 messages May 24, 2007 – May 25, 2007

Subsystems (2)
Live update kexec handover (KHO)
lore
Share & tools
lore

Maneesh Soni

author
#0 lore raw

PATCH 1/1 fix kexec-tools options

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 <[email protected]>

----

kexec.h renamed from kexec.h.orig +2 -2
@@ -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

Signature · 9 lines
Maneesh Soni
Linux Technology Center,
IBM India Systems and Technology Lab, 
Bangalore, India

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines

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 <[email protected]>

Oops.. thanks for fixing.

kexec.h

Quoted 3 lines

----

kexec.h renamed from kexec.h.orig +0 -0

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 <[email protected]>
Acked-by Michael Neuling <[email protected]>
---
 kexec/kexec.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kexec/kexec.h +2 -2
Index: 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
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#2 lore raw
Quoted 8 lines · Michael Neuling
Quoted 5 lines

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 <[email protected]>

Oops.. thanks for fixing.

Quoted 8 lines

kexec.h

Quoted 3 lines

----

kexec.h renamed from kexec.h.orig +0 -0

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.

Signature · 9 lines
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec