diff --git a/nvmed/src/nvme/identify.rs b/nvmed/src/nvme/identify.rs index 4d9f1dfc51..6f22a1fe40 100644 --- a/nvmed/src/nvme/identify.rs +++ b/nvmed/src/nvme/identify.rs @@ -1,7 +1,7 @@ -use syscall::Dma; - use super::{Nvme, NvmeCmd, NvmeNamespace}; +use common::dma::Dma; + /// See NVME spec section 5.15.2.2. #[derive(Clone, Copy)] #[repr(packed)] diff --git a/nvmed/src/nvme/mod.rs b/nvmed/src/nvme/mod.rs index 4aa0bac86a..7e34801af2 100644 --- a/nvmed/src/nvme/mod.rs +++ b/nvmed/src/nvme/mod.rs @@ -10,7 +10,9 @@ use crossbeam_channel::Sender; use smallvec::{smallvec, SmallVec}; use syscall::error::{Error, Result, EINVAL, EIO}; -use syscall::io::{Dma, Io, Mmio}; +use syscall::io::{Io, Mmio}; + +use common::dma::Dma; pub mod cmd; pub mod cq_reactor; diff --git a/nvmed/src/nvme/queues.rs b/nvmed/src/nvme/queues.rs index 7e06373efa..892e220448 100644 --- a/nvmed/src/nvme/queues.rs +++ b/nvmed/src/nvme/queues.rs @@ -1,5 +1,7 @@ use std::ptr; -use syscall::{Dma, Result}; +use syscall::Result; + +use common::dma::Dma; /// A submission queue entry. #[derive(Clone, Copy, Debug, Default)]