1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86_64/src/context_switching/main.cpp b/arch/x86_64/src/context_switching/main.cpp
index b682e79..95a25e0 100644
--- a/arch/x86_64/src/context_switching/main.cpp
+++ b/arch/x86_64/src/context_switching/main.cpp
@@ -11,10 +11,7 @@ namespace teachos::arch::context_switching
   auto initialize_descriptor_tables() -> descriptor_tables
   {
     decltype(auto) global_descriptor_table = segment_descriptor_table::initialize_global_descriptor_table();
-
-    // TODO: Replace random construction with return value of initialization.
-    interrupt_descriptor_table::interrupt_descriptor_table idt{};
-    interrupt_descriptor_table::initialize_interrupt_descriptor_table();
+    decltype(auto) interrupt_descriptor_table = interrupt_descriptor_table::initialize_interrupt_descriptor_table();
 
     kernel::cpu::jmp((uint64_t)&global_descriptor_table.at(1), boot::segment_register_reload_pointer);
 
@@ -30,7 +27,7 @@ namespace teachos::arch::context_switching
 
     kernel::cpu::set_interrupt_flag();
 
-    descriptor_tables tables = {global_descriptor_table, idt};
+    descriptor_tables tables = {global_descriptor_table, interrupt_descriptor_table};
     return tables;
   }
 }  // namespace teachos::arch::context_switching