summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorEric Andersen2004-04-12 17:59:24 +0000
committerEric Andersen2004-04-12 17:59:24 +0000
commite3efc9230c2f192e2738cee733c6d4fa20a2be2a (patch)
tree4f31c690a602713220868b2d6f98bf4aaf53eeed /init
parenta08345598d7c6d428db30cdcf8e5e7d317362da0 (diff)
downloadbusybox-e3efc9230c2f192e2738cee733c6d4fa20a2be2a.zip
busybox-e3efc9230c2f192e2738cee733c6d4fa20a2be2a.tar.gz
Jamie Guinan writes:
It looks like latest uClibc defines ARCH_HAS_MMU, but a few busybox files test UCLIBC_HAS_MMU, resulting in vfork() getting called instead of fork(), etc. Patch below. Only tested for lash. Cheers, -Jamie
Diffstat (limited to 'init')
-rw-r--r--init/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/init.c b/init/init.c
index 159b539..ae2fd4c 100644
--- a/init/init.c
+++ b/init/init.c
@@ -53,7 +53,7 @@
#endif
-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
+#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
#define fork vfork
#endif
@@ -913,7 +913,7 @@ static void check_memory(void)
if (check_free_memory() > 1000)
return;
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
if (stat("/etc/fstab", &statBuf) == 0) {
/* swapon -a requires /proc typically */
new_init_action(SYSINIT, "/bin/mount -t proc proc /proc", "");
@@ -957,7 +957,7 @@ static void parse_inittab(void)
new_init_action(CTRLALTDEL, "/sbin/reboot", "");
/* Umount all filesystems on halt/reboot */
new_init_action(SHUTDOWN, "/bin/umount -a -r", "");
-#if !defined(__UCLIBC__) || defined(__UCLIBC_HAS_MMU__)
+#if !defined(__UCLIBC__) || defined(__ARCH_HAS_MMU__)
/* Swapoff on halt/reboot */
new_init_action(SHUTDOWN, "/sbin/swapoff -a", "");
#endif