Merge branch 'post-04' into post-05

Cargo.lock

@@ -21,7 +21,7 @@ dependencies = [
  "spin",
  "uart_16550",
  "volatile",
- "x86_64",
+ "x86_64 0.11.0",
 ]
 
 [[package]]
@@ -52,7 +52,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d44b0f30cb82b0fbc15b78ade1064226529ad52028bc8cb8accb98ff6f3d7131"
 dependencies = [
  "bitflags",
- "x86_64",
+ "x86_64 0.9.6",
 ]
 
 [[package]]
@@ -70,3 +70,13 @@ dependencies = [
  "bit_field",
  "bitflags",
 ]
+
+[[package]]
+name = "x86_64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "365de37eb7c6da582cbb510dd0f3f1235d24ff6309a8a96e8a9909cc9bfd608f"
+dependencies = [
+ "bit_field",
+ "bitflags",
+]

Cargo.toml

@@ -12,7 +12,7 @@ harness = false
 bootloader = "0.9.3"
 volatile = "0.2.6"
 spin = "0.5.2"
-x86_64 = "0.9.6"
+x86_64 = "0.11.0"
 uart_16550 = "0.2.0"
 
 [dependencies.lazy_static]