4 files changed, 21 insertions, 27 deletions
diff --git a/sys/kern/exec_elf64.c b/sys/kern/exec_elf64.c
index c9040dd..3767b0b 100644
--- a/sys/kern/exec_elf64.c
+++ b/sys/kern/exec_elf64.c
@@ -30,6 +30,7 @@
 #include <sys/elf.h>
 #include <sys/exec.h>
 #include <sys/param.h>
+#include <sys/syslog.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
@@ -42,6 +43,9 @@
 #include <string.h>
 #include <machine/pcb.h>
 
+#define pr_trace(fmt, ...) kprintf("elf64: " fmt, ##__VA_ARGS__)
+#define pr_error(...) pr_trace(__VA_ARGS__)
+
 #define PHDR(HDRP, IDX) \
     (void *)((uintptr_t)HDRP + (HDRP)->e_phoff + (HDRP->e_phentsize * IDX))
 
@@ -209,6 +213,7 @@ elf64_load(const char *pathname, struct proc *td, struct exec_prog *prog)
             /* Try to allocate page frames */
             physmem = vm_alloc_frame(page_count);
             if (physmem == 0) {
+                pr_error("out of physical memory\n");
                 status = -ENOMEM;
                 break;
             }
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index aa78e8d..667bb97 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -54,10 +54,9 @@ copyright(void)
 static void
 start_init(void)
 {
-#if 0
     struct proc *td = this_td();
     struct execve_args execve_args;
-    char *argv[] = { "/usr/sbin/init", NULL };
+    char *argv[] = { "/usr/bin/osh", NULL };
     char *envp[] = { NULL };
 
     execve_args.pathname = argv[0];
@@ -65,8 +64,8 @@ start_init(void)
     execve_args.envp = envp;
     if (execve(td, &execve_args) != 0)
         panic("failed to load init\n");
-#endif
-    for (;;);
+
+    __builtin_unreachable();
 }
 
 int
@@ -75,15 +74,15 @@ main(void)
     /* Setup serial driver */
     serial_init();
 
+    /* Init the virtual memory subsystem */
+    vm_init();
+
     /* Startup the console */
     cons_init();
     copyright();
     kprintf("Starting Hyra/%s v%s: %s\n", HYRA_ARCH, HYRA_VERSION,
         HYRA_BUILDDATE);
 
-    /* Init the virtual memory subsystem */
-    vm_init();
-
     /* Start the ACPI subsystem */
     acpi_init();
 
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 201db3e..d122e89 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -148,6 +148,7 @@ static int
 fd_rw(unsigned int fd, void *buf, size_t count, uint8_t write)
 {
     char *kbuf = NULL;
+    ssize_t n;
     struct filedesc *filedes;
     struct sio_txn sio;
     scret_t retval = 0;
@@ -194,22 +195,21 @@ fd_rw(unsigned int fd, void *buf, size_t count, uint8_t write)
         }
 
         /* Call VFS write hook */
-        if ((count = vfs_vop_write(filedes->vp, &sio)) < 0) {
-            retval = -EIO;
+        if ((n = vfs_vop_write(filedes->vp, &sio)) < 0) {
+            retval = n;
             goto done;
         }
     } else {
-        if ((count = vfs_vop_read(filedes->vp, &sio)) < 0) {
-            retval = -EIO;
+        if ((n = vfs_vop_read(filedes->vp, &sio)) < 0) {
+            retval = n;
             goto done;
         }
-    }
 
-    if (copyout(kbuf, buf, count) < 0) {
-        retval = -EFAULT;
-        goto done;
+        if (copyout(kbuf, buf, count) < 0) {
+            retval = -EFAULT;
+            goto done;
+        }
     }
-
     retval = count;
 done:
     if (kbuf != NULL) {
diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c
index 35a1af7..4bbe5a0 100644
--- a/sys/kern/kern_sched.c
+++ b/sys/kern/kern_sched.c
@@ -241,18 +241,8 @@ sched_switch(struct trapframe *tf)
 void
 sched_enter(void)
 {
-    static int nenter = 0;
-
-    /*
-     * Enable interrupts for all processors and
-     * sync on first entry.
-     */
     md_inton();
-    if (nenter == 0) {
-        md_sync_all();
-        atomic_inc_int(&nenter);
-    }
-
+    md_sync_all();
     for (;;) {
         sched_oneshot(false);
         md_pause();