Merge branch 'aml-namespace' of github.com:cwood1/kernel into aml-namespace

This commit is contained in:
Connor Wood
2017-07-30 13:38:50 +03:00
2 changed files with 3 additions and 1 deletions

View File

@@ -15,6 +15,8 @@ use memory;
use paging::{self, entry, Page, VirtualAddress};
use paging::mapper::MapperFlushAll;
use stop;
/// Test of zero values in BSS.
static BSS_TEST_ZERO: usize = 0;
/// Test of non-zero values in data.

View File

@@ -5,7 +5,7 @@ use syscall::io::{Io, Pio};
pub unsafe extern fn kstop() -> ! {
println!("kstop");
acpi::set_global_s_state(5);
// Magic shutdown code for bochs and qemu (older versions).
for c in "Shutdown".bytes() {
let port = 0x8900;