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


git-svn-id: svn://busybox.net/trunk/busybox@8738 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 3 deletions

diff --git a/init/init.c b/init/init.c
index 159b53912..ae2fd4c3a 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