Merge branch 'feat_inital_context_switching' of ssh://gitlab.ost.ch:45022/teachos/kernel into feat_inital_context_switching

2 files changed, 1 insertions, 3 deletions

diff --git a/arch/x86_64/include/arch/context_switching/descriptor_table/segment_descriptor.hpp b/arch/x86_64/include/arch/context_switching/descriptor_table/segment_descriptor.hpp
index 7106771..7454470 100644
--- a/arch/x86_64/include/arch/context_switching/descriptor_table/segment_descriptor.hpp
+++ b/arch/x86_64/include/arch/context_switching/descriptor_table/segment_descriptor.hpp
@@ -56,7 +56,7 @@ namespace teachos::arch::context_switching::descriptor_table
     access_byte _access = {};    ///< Access byte field (40 - 47)
     gdt_flags _flag = {};        ///< Second part of the limit field + Flags field (48 - 55)
     uint64_t _base_2 : 40 = {};  ///< Second part of the base field (56 - 95)
-    uint32_t _reserved = {};     ///< Reserved field used to ensure this struct is 128 bits big (96 - 127)
+    uint32_t : 32;               ///< Reserved field used to ensure this struct is 128 bits big (96 - 127)
   };
 }  // namespace teachos::arch::context_switching::descriptor_table
 
diff --git a/arch/x86_64/src/context_switching/descriptor_table/segment_descriptor.cpp b/arch/x86_64/src/context_switching/descriptor_table/segment_descriptor.cpp
index c1a46a6..3e93823 100644
--- a/arch/x86_64/src/context_switching/descriptor_table/segment_descriptor.cpp
+++ b/arch/x86_64/src/context_switching/descriptor_table/segment_descriptor.cpp
@@ -8,7 +8,6 @@ namespace teachos::arch::context_switching::descriptor_table
       , _access((flags >> 40U) << 80U)
       , _flag((flags >> 52U) << 72U, (flags >> 48U) << 72U)
       , _base_2((flags >> 56U) << 32U)
-      , _reserved(flags >> 96U)
   {
     // Nothing to do.
   }
@@ -20,7 +19,6 @@ namespace teachos::arch::context_switching::descriptor_table
       , _access(access_byte)
       , _flag(flags)
       , _base_2(base >> 24U)
-      , _reserved(0U)
   {
     // Nothing to do
   }