buildworld - Fix buildworld conflict
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 21 Sep 2013 17:02:10 +0000 (10:02 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 21 Sep 2013 17:02:10 +0000 (10:02 -0700)
* Remove EX_REBOOT from include/sysexits.h, it conflicts with the
  buildworld.

* Replace EX_REBOOT with a local #define'd symbol in
  vkernel64/platform/init.c.

include/sysexits.h
sys/platform/vkernel64/platform/init.c

index 48c0520..464cb11 100644 (file)
@@ -94,7 +94,6 @@
  */
 
 #define EX_OK          0       /* successful termination */
-#define EX_REBOOT      32      /* vkernel specific - reboot */
 
 #define EX__BASE       64      /* base value for error messages */
 
index 21519da..3d7f5b8 100644 (file)
@@ -82,6 +82,7 @@
 #include <assert.h>
 #include <sysexits.h>
 
+#define EX_VKERNEL_REBOOT      32
 
 vm_paddr_t phys_avail[16];
 vm_paddr_t Maxmem;
@@ -207,7 +208,7 @@ int main(int ac, char **av) {
                        if (errno == ECHILD)
                                exit(1);
                }
-               if (WEXITSTATUS(status) != EX_REBOOT)
+               if (WEXITSTATUS(status) != EX_VKERNEL_REBOOT)
                        return 0;
        }
 
@@ -1531,7 +1532,7 @@ cpu_reset(void)
        kprintf("cpu reset, rebooting vkernel\n");
        closefrom(3);
        cleanpid();
-       exit(EX_REBOOT);
+       exit(EX_VKERNEL_REBOOT);
 
 }