diff --git a/reactos/ntoskrnl/include/internal/i386/intrin_i.h b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
index 9ddb0f48f4a..547cab66ae3 100644
--- a/reactos/ntoskrnl/include/internal/i386/intrin_i.h
+++ b/reactos/ntoskrnl/include/internal/i386/intrin_i.h
@@ -168,28 +168,28 @@ Ke386HaltProcessor(VOID)
 
 VOID
 FORCEINLINE
-Ke386GetInterruptDescriptorTable(OUT USHORT Descriptor)
+Ke386GetInterruptDescriptorTable(OUT KDESCRIPTOR Descriptor)
 {
     __asm sidt Descriptor;
 }
 
 VOID
 FORCEINLINE
-Ke386SetInterruptDescriptorTable(IN USHORT Descriptor)
+Ke386SetInterruptDescriptorTable(IN KDESCRIPTOR Descriptor)
 {
     __asm lidt Descriptor;
 }
 
 VOID
 FORCEINLINE
-Ke386GetGlobalDescriptorTable(OUT USHORT Descriptor)
+Ke386GetGlobalDescriptorTable(OUT KDESCRIPTOR Descriptor)
 {
     __asm sgdt Descriptor;
 }
 
 VOID
 FORCEINLINE
-Ke386SetGlobalDescriptorTable(IN USHORT Descriptor)
+Ke386SetGlobalDescriptorTable(IN KDESCRIPTOR Descriptor)
 {
     __asm lgdt Descriptor;
 }
diff --git a/reactos/ntoskrnl/ke/i386/cpu.c b/reactos/ntoskrnl/ke/i386/cpu.c
index 979b02b8631..332560e9435 100644
--- a/reactos/ntoskrnl/ke/i386/cpu.c
+++ b/reactos/ntoskrnl/ke/i386/cpu.c
@@ -697,8 +697,8 @@ KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState)
     //
     // Restore GDT, IDT, LDT and TSS
     //
-    Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base);
-    Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base);
+    Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr);
+    Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr);
     Ke386SetTr(ProcessorState->SpecialRegisters.Tr);
     Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr);
 }
@@ -724,8 +724,8 @@ KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState)
     Ke386SetDr7(0);
 
     /* Save GDT, IDT, LDT and TSS */
-    Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr.Base);
-    Ke386GetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr.Base);
+    Ke386GetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr);
+    Ke386GetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr);
     Ke386GetTr(ProcessorState->SpecialRegisters.Tr);
     Ke386GetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr);
 }