From fb06d3782fafa1c1bbfd1b3c743d370d2e78597a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 6 Oct 2024 09:58:37 -0600
Subject: [PATCH] Fix build on aarch64

---
 common/src/io.rs      | 2 ++
 common/src/io/mmio.rs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/src/io.rs b/common/src/io.rs
index 698b23fb02..b79d4cabe8 100644
--- a/common/src/io.rs
+++ b/common/src/io.rs
@@ -4,9 +4,11 @@ use core::{
 };
 
 mod mmio;
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 mod pio;
 
 pub use mmio::*;
+#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub use pio::*;
 
 /// IO abstraction
diff --git a/common/src/io/mmio.rs b/common/src/io/mmio.rs
index ca9d564ce2..c20cf52716 100644
--- a/common/src/io/mmio.rs
+++ b/common/src/io/mmio.rs
@@ -35,7 +35,7 @@ impl<T> Mmio<T> {
 #[cfg(not(any(target_arch = "x86", target_arch = "x86_64")))]
 impl<T> Io for Mmio<T>
 where
-    T: Copy + PartialEq + BitAnd<Output = T> + BitOr<Output = T> + Not<Output = T>,
+    T: Copy + PartialEq + core::ops::BitAnd<Output = T> + core::ops::BitOr<Output = T> + core::ops::Not<Output = T>,
 {
     type Value = T;