From ac788a2c8eefa7c0604849fafaa5ecc199d80663 Mon Sep 17 00:00:00 2001 From: Timon Kruiper Date: Tue, 25 Oct 2022 22:09:00 +0200 Subject: [PATCH] Kernel: Remove duplicate Processor::restore_in_critical There is already Processor::restore_critical, which does exactly the same thing. --- Kernel/Arch/x86_64/Processor.cpp | 4 ++-- Kernel/Arch/x86_64/Processor.h | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Kernel/Arch/x86_64/Processor.cpp b/Kernel/Arch/x86_64/Processor.cpp index 96e363a157..a169988e8a 100644 --- a/Kernel/Arch/x86_64/Processor.cpp +++ b/Kernel/Arch/x86_64/Processor.cpp @@ -1493,7 +1493,7 @@ extern "C" void context_first_init([[maybe_unused]] Thread* from_thread, [[maybe auto in_critical = to_thread->saved_critical(); VERIFY(in_critical > 0); - Processor::restore_in_critical(in_critical); + Processor::restore_critical(in_critical); // Since we got here and don't have Scheduler::context_switch in the // call stack (because this is the first time we switched into this @@ -1554,7 +1554,7 @@ extern "C" void enter_thread_context(Thread* from_thread, Thread* to_thread) auto in_critical = to_thread->saved_critical(); VERIFY(in_critical > 0); - Processor::restore_in_critical(in_critical); + Processor::restore_critical(in_critical); if (has_xsave_avx_support) asm volatile("xrstor %0" ::"m"(to_thread->fpu_state()), "a"(static_cast(SIMD::StateComponent::AVX | SIMD::StateComponent::SSE | SIMD::StateComponent::X87)), "d"(0u)); diff --git a/Kernel/Arch/x86_64/Processor.h b/Kernel/Arch/x86_64/Processor.h index cd1dc9c8ef..5f2f32d1fa 100644 --- a/Kernel/Arch/x86_64/Processor.h +++ b/Kernel/Arch/x86_64/Processor.h @@ -318,11 +318,6 @@ public: return read_gs_ptr(__builtin_offsetof(Processor, m_in_irq)); } - ALWAYS_INLINE static void restore_in_critical(u32 critical) - { - write_gs_ptr(__builtin_offsetof(Processor, m_in_critical), critical); - } - ALWAYS_INLINE static void enter_critical() { write_gs_ptr(__builtin_offsetof(Processor, m_in_critical), in_critical() + 1);