From 79b700b2f65976508f71d2d46b719f145fb4a178 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 28 Dec 2016 17:22:10 -0700
Subject: [PATCH] Update coreutils, remove sys:memory

---
 kernel/lib.rs               | 15 ++++++++-------
 kernel/scheme/sys/memory.rs | 10 ----------
 kernel/scheme/sys/mod.rs    |  2 --
 programs/coreutils          |  2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 kernel/scheme/sys/memory.rs

diff --git a/kernel/lib.rs b/kernel/lib.rs
index 5027cde..5502278 100644
--- a/kernel/lib.rs
+++ b/kernel/lib.rs
@@ -98,7 +98,7 @@ pub extern fn userspace_init() {
 
     syscall::exec(b"/bin/init", &[]).expect("failed to execute init");
 
-    panic!("init returned")
+    panic!("init returned");
 }
 
 /// Allow exception handlers to send signal to arch-independant kernel
@@ -151,7 +151,13 @@ pub extern fn kmain(cpus: usize) {
 
 /// This is the main kernel entry point for secondary CPUs
 #[no_mangle]
-pub extern fn kmain_ap(id: usize) {
+pub extern fn kmain_ap(_id: usize) {
+    // Disable APs for now
+    loop {
+        unsafe { interrupt::enable_and_halt(); }
+    }
+
+    /*
     CPU_ID.store(id, Ordering::SeqCst);
 
     context::init();
@@ -159,11 +165,6 @@ pub extern fn kmain_ap(id: usize) {
     let pid = syscall::getpid();
     println!("AP {}: {:?}", id, pid);
 
-    // Disable APs for now
-    loop {
-        unsafe { interrupt::enable_and_halt(); }
-    }
-/*
     loop {
         unsafe {
             interrupt::disable();
diff --git a/kernel/scheme/sys/memory.rs b/kernel/scheme/sys/memory.rs
deleted file mode 100644
index ba58ae0..0000000
--- a/kernel/scheme/sys/memory.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use collections::Vec;
-
-use arch::memory::{free_frames, used_frames};
-use syscall::error::Result;
-
-pub fn resource() -> Result<Vec<u8>> {
-    let string = format!("Memory Used: {} KB\nMemory Free: {} KB\n", used_frames() * 4, free_frames() * 4);
-
-    Ok(string.into_bytes())
-}
diff --git a/kernel/scheme/sys/mod.rs b/kernel/scheme/sys/mod.rs
index 3f47ac8..ce5fd23 100644
--- a/kernel/scheme/sys/mod.rs
+++ b/kernel/scheme/sys/mod.rs
@@ -12,7 +12,6 @@ use syscall::scheme::Scheme;
 mod context;
 mod cpu;
 mod exe;
-mod memory;
 mod scheme;
 //mod interrupt;
 //mod log;
@@ -41,7 +40,6 @@ impl SysScheme {
         files.insert(b"context", Box::new(move || context::resource()));
         files.insert(b"cpu", Box::new(move || cpu::resource()));
         files.insert(b"exe", Box::new(move || exe::resource()));
-        files.insert(b"memory", Box::new(move || memory::resource()));
         files.insert(b"scheme", Box::new(move || scheme::resource()));
         //files.insert(b"interrupt", Box::new(move || interrupt::resource()));
         //files.insert(b"log", Box::new(move || log::resource()));
diff --git a/programs/coreutils b/programs/coreutils
index fe68f36..30dae30 160000
--- a/programs/coreutils
+++ b/programs/coreutils
@@ -1 +1 @@
-Subproject commit fe68f368a7e8cf3a690651da596fb769ac1cb20e
+Subproject commit 30dae30ee0c4d4628f08b04db9d7f986cc975763