aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/init.c8
-rw-r--r--init/reboot.c13
2 files changed, 4 insertions, 17 deletions
diff --git a/init/init.c b/init/init.c
index 69ce4b2c9..1f0bd4aec 100644
--- a/init/init.c
+++ b/init/init.c
@@ -42,6 +42,7 @@
#include <sys/mount.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/reboot.h>
#include "busybox.h"
#include "init_shared.h"
@@ -50,9 +51,6 @@
#ifdef CONFIG_SYSLOGD
# include <sys/syslog.h>
#endif
-#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__)
-#include <sys/reboot.h>
-#endif
#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
@@ -665,11 +663,7 @@ static void init_reboot(unsigned long magic)
* linux/kernel/sys.c, which can cause the machine to panic when
* the init process is killed.... */
if ((pid = fork()) == 0) {
-#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__)
reboot(magic);
-#else
- reboot(0xfee1dead, 672274793, magic);
-#endif
_exit(0);
}
waitpid (pid, NULL, 0);
diff --git a/init/reboot.c b/init/reboot.c
index e9f9ff831..5ca8b588a 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -25,18 +25,11 @@
#include <stdlib.h>
#include <unistd.h>
#include <getopt.h>
-
+#include <sys/reboot.h>
#include "busybox.h"
#include "init_shared.h"
-#if (__GNU_LIBRARY__ > 5) || defined(__dietlibc__)
- #include <sys/reboot.h>
- #define init_reboot(magic) reboot(magic)
-#else
- #define init_reboot(magic) reboot(0xfee1dead, 672274793, magic)
-#endif
-
#ifndef RB_ENABLE_CAD
static const int RB_ENABLE_CAD = 0x89abcdef;
static const int RB_AUTOBOOT = 0x01234567;
@@ -57,7 +50,7 @@ extern int reboot_main(int argc, char **argv)
setpgrp();
/* Allow Ctrl-Alt-Del to reboot system. */
- init_reboot(RB_ENABLE_CAD);
+ reboot(RB_ENABLE_CAD);
message(CONSOLE|LOG, "\n\rThe system is going down NOW !!\n");
sync();
@@ -74,7 +67,7 @@ extern int reboot_main(int argc, char **argv)
sync();
- init_reboot(RB_AUTOBOOT);
+ reboot(RB_AUTOBOOT);
return 0; /* Shrug */
#else
return kill_init(SIGTERM);