From f5abf681ca3598a73469b3860a86dabfe16343f6 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Mon, 20 Dec 2021 08:20:16 +0100
Subject: [PATCH 1/2] Update x86_64 dependency to v0.14.7 to fix nightly
 breakage

---
 Cargo.lock                | 21 +++++++++++----------
 Cargo.toml                |  2 +-
 example-kernel/Cargo.toml |  2 +-
 test-kernel/Cargo.toml    |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8eb42f90..4bb82fc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "bit_field"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56"
-
 [[package]]
 name = "bit_field"
 version = "0.10.1"
@@ -24,7 +18,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 name = "bootloader"
 version = "0.9.19"
 dependencies = [
- "bit_field 0.10.1",
+ "bit_field",
  "fixedvec",
  "font8x8",
  "llvm-tools",
@@ -80,14 +74,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f70329e2cbe45d6c97a5112daad40c34cd9a4e18edb5a2a18fefeb584d8d25e5"
 
+[[package]]
+name = "volatile"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0"
+
 [[package]]
 name = "x86_64"
-version = "0.13.2"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b871116e3c83dad0795580b10b2b1dd05cb52ec719af36180371877b09681f7f"
+checksum = "fb611915c917c6296d11e23f71ff1ecfe49c5766daba92cd3df52df6b58285b6"
 dependencies = [
- "bit_field 0.9.0",
+ "bit_field",
  "bitflags",
+ "volatile",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 325fa172..8a1aee40 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ required-features = ["binary"]
 
 [dependencies]
 xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { version = "0.13.2", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", optional = true, default-features = false, features = ["instructions", "inline_asm"] }
 usize_conversions = { version = "0.2.0", optional = true }
 fixedvec = { version = "0.2.4", optional = true }
 bit_field = { version = "0.10.0", optional = true }
diff --git a/example-kernel/Cargo.toml b/example-kernel/Cargo.toml
index 62593e09..557284b7 100644
--- a/example-kernel/Cargo.toml
+++ b/example-kernel/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }
diff --git a/test-kernel/Cargo.toml b/test-kernel/Cargo.toml
index 228b7790..d21177df 100644
--- a/test-kernel/Cargo.toml
+++ b/test-kernel/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["Philipp Oppermann <dev@phil-opp.com>"]
 edition = "2018"
 
 [dependencies]
-x86_64 = { version = "0.13.2", default-features = false, features = ["instructions", "inline_asm"] }
+x86_64 = { version = "0.14.7", default-features = false, features = ["instructions", "inline_asm"] }

From 857e48ed4e7214465f8b5a766bf6be5e96c76598 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Mon, 20 Dec 2021 08:32:42 +0100
Subject: [PATCH 2/2] Import `global_asm` macro which now lives under
 `core::arch`

---
 src/main.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 3ccac477..7b552ca9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,8 +10,7 @@ compile_error!("The bootloader crate must be compiled for the `x86_64-bootloader
 extern crate rlibc;
 
 use bootloader::bootinfo::{BootInfo, FrameRange};
-use core::convert::TryInto;
-use core::panic::PanicInfo;
+use core::{arch::global_asm, convert::TryInto, panic::PanicInfo};
 use core::{mem, slice};
 use fixedvec::alloc_stack;
 use usize_conversions::usize_from;