diff --git a/ostd/src/arch/x86/cpu/context/mod.rs b/ostd/src/arch/x86/cpu/context/mod.rs
index 7bb27e98e..a608d8140 100644
--- a/ostd/src/arch/x86/cpu/context/mod.rs
+++ b/ostd/src/arch/x86/cpu/context/mod.rs
@@ -666,7 +666,7 @@ pub(in crate::arch) fn enable_essential_features() {
         let size = cpuid
             .get_extended_state_info()
             .unwrap()
-            .xsave_area_size_supported_features() as usize;
+            .xsave_area_size_enabled_features() as usize;
         debug_assert!(size <= MAX_XSAVE_AREA_SIZE);
         size
     });
diff --git a/ostd/src/arch/x86/mod.rs b/ostd/src/arch/x86/mod.rs
index fc46b6f2a..f8f2de14b 100644
--- a/ostd/src/arch/x86/mod.rs
+++ b/ostd/src/arch/x86/mod.rs
@@ -180,8 +180,6 @@ pub(crate) fn enable_cpu_features() {
         cpuid.get_feature_info().unwrap()
     });
 
-    cpu::context::enable_essential_features();
-
     let mut cr4 = x86_64::registers::control::Cr4::read();
     cr4 |= Cr4Flags::FSGSBASE
         | Cr4Flags::OSXSAVE
@@ -208,6 +206,8 @@ pub(crate) fn enable_cpu_features() {
         x86_64::registers::xcontrol::XCr0::write(xcr0);
     }
 
+    cpu::context::enable_essential_features();
+
     unsafe {
         // enable non-executable page protection
         x86_64::registers::model_specific::Efer::update(|efer| {