kexec: simply pass LINUX_REBOOT_CMD_KEXEC to reboot

PATCH Superseded maximilian attems 1 participant 1 message May 22, 2012

Subsystems (2)

Live update kexec handover (KHO)

lore

Share & tools

lore

maximilian attems

author

2012-05-22 16:18 UTC #0 lore raw

PATCH 1/1 kexec: simply pass LINUX_REBOOT_CMD_KEXEC to reboot

While trying to port kexec cleanly to klibc,
came across this syscall usage for reboot(2).
Calling reboot directly simplifies the code.

Signed-off-by maximilian attems <[email protected]>

---
 kexec/kexec-syscall.h |   20 --------------------
 kexec/kexec.c         |    4 +++-
 2 files changed, 3 insertions(+), 21 deletions(-)

The next TODO item is to add proper syscall kexec_load() to glibc. Funnily here klibc has an head start! -maks

kexec/kexec-syscall.h +0 ~~-20~~

index f4df45c..415fbd7 100644
@@ -5,22 +5,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#define	LINUX_REBOOT_MAGIC1	0xfee1dead
-#define	LINUX_REBOOT_MAGIC2	672274793
-#define	LINUX_REBOOT_MAGIC2A	85072278
-#define	LINUX_REBOOT_MAGIC2B	369367448
-
-#define	LINUX_REBOOT_CMD_RESTART	0x01234567
-#define	LINUX_REBOOT_CMD_HALT		0xCDEF0123
-#define	LINUX_REBOOT_CMD_CAD_ON		0x89ABCDEF
-#define	LINUX_REBOOT_CMD_CAD_OFF	0x00000000
-#define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
-#define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
-#define LINUX_REBOOT_CMD_EXEC_KERNEL    0x18273645
-#define LINUX_REBOOT_CMD_KEXEC_OLD	0x81726354
-#define LINUX_REBOOT_CMD_KEXEC_OLD2	0x18263645
-#define LINUX_REBOOT_CMD_KEXEC		0x45584543
-
 #ifndef __NR_kexec_load
 #ifdef __i386__
 #define __NR_kexec_load		283

@@ -70,10 +54,6 @@ static inline long kexec_load(void *entry, unsigned long nr_segments,
 	return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags);
 }
 
-static inline long kexec_reboot(void)
-{
-	return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
-}
 
 
 #define KEXEC_ON_CRASH		0x00000001

kexec/kexec.c +3 -1

index d2d05a8..ee23b5e 100644
@@ -28,6 +28,8 @@
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/reboot.h>
+#include <linux/reboot.h>
 #include <unistd.h>
 #include <fcntl.h>
 #ifndef _O_BINARY

@@ -822,7 +824,7 @@ static int my_shutdown(void)
  */
 static int my_exec(void)
 {
-	kexec_reboot();
+	reboot(LINUX_REBOOT_CMD_KEXEC);
 	/* I have failed if I make it here */
 	fprintf(stderr, "kexec failed: %s\n", 
 		strerror(errno));

Signature · 7 lines

1.7.10


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