From eba33f82b889a3aedc6c72e489e05d9e6ac8a8d1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 26 Jun 2021 19:56:50 +0200 Subject: [PATCH] Kernel: Reorder code a bit to clarify which #if block it belongs to --- Kernel/Arch/x86/common/Processor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel/Arch/x86/common/Processor.cpp b/Kernel/Arch/x86/common/Processor.cpp index 4d46b56f70..2251534de0 100644 --- a/Kernel/Arch/x86/common/Processor.cpp +++ b/Kernel/Arch/x86/common/Processor.cpp @@ -1120,9 +1120,7 @@ UNMAP_AFTER_INIT void Processor::gdt_init() #if ARCH(X86_64) MSR fs_base(MSR_FS_BASE); fs_base.set((size_t)this & 0xffffffff, (size_t)this >> 32); -#endif - -#if ARCH(I386) +#else asm volatile( "mov %%ax, %%ds\n" "mov %%ax, %%es\n" @@ -1130,7 +1128,9 @@ UNMAP_AFTER_INIT void Processor::gdt_init() "mov %%ax, %%ss\n" ::"a"(GDT_SELECTOR_DATA0) : "memory"); set_fs(GDT_SELECTOR_PROC); +#endif +#if ARCH(I386) // Make sure CS points to the kernel code descriptor. // clang-format off asm volatile(