Skip to content

Commit 96f7233

Browse files
committed
memory_encryption: remove feature dynamic_flags
1 parent 8a3abd1 commit 96f7233

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ rustversion = "1.0.5"
2828
[features]
2929
default = ["nightly", "instructions"]
3030
instructions = []
31-
memory_encryption = ["dynamic_flags"]
32-
dynamic_flags = []
31+
memory_encryption = []
3332
nightly = ["const_fn", "step_trait", "abi_x86_interrupt", "asm_const"]
3433
abi_x86_interrupt = []
3534
# deprecated, no longer needed

src/structures/paging/page_table.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use core::fmt;
77
#[cfg(feature = "step_trait")]
88
use core::iter::Step;
99
use core::ops::{Index, IndexMut};
10-
#[cfg(feature = "dynamic_flags")]
10+
#[cfg(feature = "memory_encryption")]
1111
use core::sync::atomic::{AtomicU64, Ordering};
1212

1313
/// The error returned by the `PageTableEntry::frame` method.
@@ -21,7 +21,7 @@ pub enum FrameError {
2121
}
2222

2323
/// The mask used to remove flags from a page table entry to obtain the physical address
24-
#[cfg(feature = "dynamic_flags")]
24+
#[cfg(feature = "memory_encryption")]
2525
pub(crate) static PHYSICAL_ADDRESS_MASK: AtomicU64 = AtomicU64::new(0x000f_ffff_ffff_f000u64);
2626

2727
/// A 64-bit page table entry.
@@ -101,15 +101,15 @@ impl PageTableEntry {
101101
}
102102
}
103103

104-
#[cfg(feature = "dynamic_flags")]
104+
#[cfg(feature = "memory_encryption")]
105105
impl PageTableEntry {
106106
#[inline(always)]
107107
fn physical_address_mask() -> u64 {
108108
PHYSICAL_ADDRESS_MASK.load(Ordering::Relaxed)
109109
}
110110
}
111111

112-
#[cfg(not(feature = "dynamic_flags"))]
112+
#[cfg(not(feature = "memory_encryption"))]
113113
impl PageTableEntry {
114114
#[inline(always)]
115115
#[rustversion::attr(since(1.61), const)]

0 commit comments

Comments
 (0)