From bb58a4d94394ae19e0b850b15cfb105c91a1ee7b Mon Sep 17 00:00:00 2001 From: Brian Gianforcaro Date: Sun, 5 Sep 2021 10:02:03 -0700 Subject: [PATCH] Kernel: Make all Spinlocks use u8 for storage, remove template The default template argument is only used in one place, and it looks like it was probably just an oversight. The rest of the Kernel code all uses u8 as the type. So lets make that the default and remove the unused template argument, as there doesn't seem to be a reason to allow the size to be customizable. --- Documentation/Kernel/AHCILocking.md | 2 +- Kernel/Bus/PCI/MMIOAccess.h | 2 +- Kernel/Bus/USB/SysFSUSB.h | 2 +- Kernel/Bus/VirtIO/Queue.h | 4 ++-- Kernel/Devices/AsyncDeviceRequest.h | 4 ++-- Kernel/Devices/Device.h | 2 +- Kernel/Devices/HID/I8042Controller.h | 2 +- Kernel/Devices/HID/KeyboardDevice.h | 2 +- Kernel/Devices/HID/MouseDevice.h | 2 +- Kernel/Devices/KCOVInstance.h | 2 +- Kernel/Devices/SerialDevice.h | 2 +- Kernel/FileSystem/Plan9FileSystem.h | 6 +++--- Kernel/FileSystem/SysFSComponent.cpp | 2 +- Kernel/Forward.h | 1 - Kernel/Graphics/Bochs/GraphicsAdapter.h | 2 +- Kernel/Graphics/Console/GenericFramebufferConsole.h | 2 +- Kernel/Graphics/Console/TextModeConsole.h | 2 +- Kernel/Graphics/FramebufferDevice.h | 2 +- Kernel/Graphics/GraphicsManagement.h | 4 ++-- Kernel/Graphics/Intel/NativeGraphicsAdapter.h | 6 +++--- Kernel/Locking/Mutex.cpp | 2 +- Kernel/Locking/Mutex.h | 4 ++-- Kernel/Locking/Spinlock.h | 3 +-- Kernel/Memory/AnonymousVMObject.h | 2 +- Kernel/Memory/MemoryManager.h | 2 +- Kernel/Memory/RingBuffer.h | 4 ++-- Kernel/Memory/VirtualRangeAllocator.h | 2 +- Kernel/Process.h | 4 ++-- Kernel/ProcessExposed.cpp | 2 +- Kernel/Random.h | 6 +++--- Kernel/Storage/AHCIPort.cpp | 6 +++--- Kernel/Storage/AHCIPort.h | 8 ++++---- Kernel/Storage/IDEChannel.h | 2 +- Kernel/TTY/ConsoleManagement.h | 2 +- Kernel/Thread.cpp | 2 +- Kernel/Thread.h | 6 +++--- Kernel/TimerQueue.cpp | 2 +- Kernel/WorkQueue.h | 2 +- 38 files changed, 56 insertions(+), 58 deletions(-) diff --git a/Documentation/Kernel/AHCILocking.md b/Documentation/Kernel/AHCILocking.md index 6986d9582c0..53f9d68f2fc 100644 --- a/Documentation/Kernel/AHCILocking.md +++ b/Documentation/Kernel/AHCILocking.md @@ -18,7 +18,7 @@ return true; This lock doesn't disable interrupts at all, and if it is already in use, the scheduler will simply yield away from that section until it tries to lock it again. -### Hard lock - `SpinLock` +### Hard lock - `Spinlock` A hard lock is essentially a lock that is used in critical sections in the kernel. We use it with a `ScopedSpinLock` class, to create a scoped locking of that lock: diff --git a/Kernel/Bus/PCI/MMIOAccess.h b/Kernel/Bus/PCI/MMIOAccess.h index 8680fdca1cb..f9ef6792d4f 100644 --- a/Kernel/Bus/PCI/MMIOAccess.h +++ b/Kernel/Bus/PCI/MMIOAccess.h @@ -44,7 +44,7 @@ private: PhysicalAddress determine_memory_mapped_bus_region(u32 segment, u8 bus) const; void map_bus_region(u32, u8); VirtualAddress get_device_configuration_space(Address address); - Spinlock m_access_lock; + Spinlock m_access_lock; u8 m_mapped_bus { 0 }; OwnPtr m_mapped_region; diff --git a/Kernel/Bus/USB/SysFSUSB.h b/Kernel/Bus/USB/SysFSUSB.h index ff8cf9a76a5..4ba0e20b092 100644 --- a/Kernel/Bus/USB/SysFSUSB.h +++ b/Kernel/Bus/USB/SysFSUSB.h @@ -55,7 +55,7 @@ private: RefPtr device_node_for(USB::Device& device); IntrusiveList, &SysFSUSBDeviceInformation::m_list_node> m_device_nodes; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; } diff --git a/Kernel/Bus/VirtIO/Queue.h b/Kernel/Bus/VirtIO/Queue.h index 5ff8fd0e4fd..a83f4aae3ef 100644 --- a/Kernel/Bus/VirtIO/Queue.h +++ b/Kernel/Bus/VirtIO/Queue.h @@ -47,7 +47,7 @@ public: QueueChain pop_used_buffer_chain(size_t& used); void discard_used_buffers(); - Spinlock& lock() { return m_lock; } + Spinlock& lock() { return m_lock; } bool should_notify() const; @@ -94,7 +94,7 @@ private: OwnPtr m_driver { nullptr }; OwnPtr m_device { nullptr }; OwnPtr m_queue_region; - Spinlock m_lock; + Spinlock m_lock; friend class QueueChain; }; diff --git a/Kernel/Devices/AsyncDeviceRequest.h b/Kernel/Devices/AsyncDeviceRequest.h index 07e581fb1f9..a67ddcd5016 100644 --- a/Kernel/Devices/AsyncDeviceRequest.h +++ b/Kernel/Devices/AsyncDeviceRequest.h @@ -61,7 +61,7 @@ public: [[nodiscard]] RequestWaitResult wait(Time* = nullptr); - void do_start(SpinlockLocker>&& requests_lock) + void do_start(SpinlockLocker&& requests_lock) { if (is_completed_result(m_result)) return; @@ -150,7 +150,7 @@ private: WaitQueue m_queue; NonnullRefPtr m_process; void* m_private { nullptr }; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; } diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h index 3a3e8bcfdbb..0011f4636e1 100644 --- a/Kernel/Devices/Device.h +++ b/Kernel/Devices/Device.h @@ -72,7 +72,7 @@ private: UserID m_uid { 0 }; GroupID m_gid { 0 }; - Spinlock m_requests_lock; + Spinlock m_requests_lock; DoublyLinkedList> m_requests; }; diff --git a/Kernel/Devices/HID/I8042Controller.h b/Kernel/Devices/HID/I8042Controller.h index ab31ff55faf..cc67b636abf 100644 --- a/Kernel/Devices/HID/I8042Controller.h +++ b/Kernel/Devices/HID/I8042Controller.h @@ -105,7 +105,7 @@ private: void do_wait_then_write(u8 port, u8 data); u8 do_wait_then_read(u8 port); - Spinlock m_lock; + Spinlock m_lock; bool m_first_port_available { false }; bool m_second_port_available { false }; bool m_is_dual_channel { false }; diff --git a/Kernel/Devices/HID/KeyboardDevice.h b/Kernel/Devices/HID/KeyboardDevice.h index 2a7fff18c7a..cbb705b6059 100644 --- a/Kernel/Devices/HID/KeyboardDevice.h +++ b/Kernel/Devices/HID/KeyboardDevice.h @@ -51,7 +51,7 @@ public: protected: KeyboardDevice(); - mutable Spinlock m_queue_lock; + mutable Spinlock m_queue_lock; CircularQueue m_queue; // ^CharacterDevice virtual StringView class_name() const override { return "KeyboardDevice"; } diff --git a/Kernel/Devices/HID/MouseDevice.h b/Kernel/Devices/HID/MouseDevice.h index 1c2eaee4886..ad1c94cbe65 100644 --- a/Kernel/Devices/HID/MouseDevice.h +++ b/Kernel/Devices/HID/MouseDevice.h @@ -41,7 +41,7 @@ protected: // ^CharacterDevice virtual StringView class_name() const override { return "MouseDevice"; } - mutable Spinlock m_queue_lock; + mutable Spinlock m_queue_lock; CircularQueue m_queue; }; diff --git a/Kernel/Devices/KCOVInstance.h b/Kernel/Devices/KCOVInstance.h index 393c9ad0786..8a5ecfc86b0 100644 --- a/Kernel/Devices/KCOVInstance.h +++ b/Kernel/Devices/KCOVInstance.h @@ -35,7 +35,7 @@ public: bool has_buffer() const { return m_buffer != nullptr; } void buffer_add_pc(u64 pc); - Spinlock lock; + Spinlock lock; enum { UNUSED = 0, OPENED = 1, diff --git a/Kernel/Devices/SerialDevice.h b/Kernel/Devices/SerialDevice.h index 6daf8fea347..81aedfd8cea 100644 --- a/Kernel/Devices/SerialDevice.h +++ b/Kernel/Devices/SerialDevice.h @@ -133,7 +133,7 @@ private: bool m_break_enable { false }; u8 m_modem_control { 0 }; bool m_last_put_char_was_carriage_return { false }; - Spinlock m_serial_lock; + Spinlock m_serial_lock; }; } diff --git a/Kernel/FileSystem/Plan9FileSystem.h b/Kernel/FileSystem/Plan9FileSystem.h index 79f3fdd0b07..b5b3f4ba6bd 100644 --- a/Kernel/FileSystem/Plan9FileSystem.h +++ b/Kernel/FileSystem/Plan9FileSystem.h @@ -66,11 +66,11 @@ private: private: Plan9FS& m_fs; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; struct ReceiveCompletion : public RefCounted { - mutable Spinlock lock; + mutable Spinlock lock; bool completed { false }; const u16 tag; OwnPtr message; @@ -139,7 +139,7 @@ private: Plan9FSBlockerSet m_completion_blocker; HashMap> m_completions; - Spinlock m_thread_lock; + Spinlock m_thread_lock; RefPtr m_thread; Atomic m_thread_running { false }; Atomic m_thread_shutdown { false }; diff --git a/Kernel/FileSystem/SysFSComponent.cpp b/Kernel/FileSystem/SysFSComponent.cpp index 1b3697e4992..3e1d9eb8c14 100644 --- a/Kernel/FileSystem/SysFSComponent.cpp +++ b/Kernel/FileSystem/SysFSComponent.cpp @@ -9,7 +9,7 @@ namespace Kernel { -static Spinlock s_index_lock; +static Spinlock s_index_lock; static InodeIndex s_next_inode_index { 0 }; static size_t allocate_inode_index() diff --git a/Kernel/Forward.h b/Kernel/Forward.h index b6ece18eba9..27cf687abfc 100644 --- a/Kernel/Forward.h +++ b/Kernel/Forward.h @@ -84,7 +84,6 @@ class VirtualRange; class VirtualRangeAllocator; } -template class Spinlock; template class SpinlockLocker; diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.h b/Kernel/Graphics/Bochs/GraphicsAdapter.h index 7eae38116d9..1d941636870 100644 --- a/Kernel/Graphics/Bochs/GraphicsAdapter.h +++ b/Kernel/Graphics/Bochs/GraphicsAdapter.h @@ -60,7 +60,7 @@ private: Memory::TypedMapping m_registers; RefPtr m_framebuffer_device; RefPtr m_framebuffer_console; - Spinlock m_console_mode_switch_lock; + Spinlock m_console_mode_switch_lock; bool m_console_enabled { false }; bool m_io_required { false }; }; diff --git a/Kernel/Graphics/Console/GenericFramebufferConsole.h b/Kernel/Graphics/Console/GenericFramebufferConsole.h index 637e5daa4de..d9b048c1961 100644 --- a/Kernel/Graphics/Console/GenericFramebufferConsole.h +++ b/Kernel/Graphics/Console/GenericFramebufferConsole.h @@ -47,6 +47,6 @@ protected: virtual u8* framebuffer_data() = 0; void clear_glyph(size_t x, size_t y); size_t m_pitch; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; } diff --git a/Kernel/Graphics/Console/TextModeConsole.h b/Kernel/Graphics/Console/TextModeConsole.h index 8004c435d6a..72e2e28d5ca 100644 --- a/Kernel/Graphics/Console/TextModeConsole.h +++ b/Kernel/Graphics/Console/TextModeConsole.h @@ -39,7 +39,7 @@ private: explicit TextModeConsole(const VGACompatibleAdapter&); - mutable Spinlock m_vga_lock; + mutable Spinlock m_vga_lock; u16 m_vga_start_row { 0 }; u16 m_current_vga_start_address { 0 }; u8* m_current_vga_window { nullptr }; diff --git a/Kernel/Graphics/FramebufferDevice.h b/Kernel/Graphics/FramebufferDevice.h index 45195fc661a..31a33e88661 100644 --- a/Kernel/Graphics/FramebufferDevice.h +++ b/Kernel/Graphics/FramebufferDevice.h @@ -53,7 +53,7 @@ private: size_t m_framebuffer_width { 0 }; size_t m_framebuffer_height { 0 }; - Spinlock m_activation_lock; + Spinlock m_activation_lock; RefPtr m_real_framebuffer_vmobject; RefPtr m_swapped_framebuffer_vmobject; diff --git a/Kernel/Graphics/GraphicsManagement.h b/Kernel/Graphics/GraphicsManagement.h index 4e8c3630f3f..47b6a2179be 100644 --- a/Kernel/Graphics/GraphicsManagement.h +++ b/Kernel/Graphics/GraphicsManagement.h @@ -40,7 +40,7 @@ public: bool framebuffer_devices_allowed() const { return m_framebuffer_devices_allowed; } bool framebuffer_devices_exist() const; - Spinlock& main_vga_lock() { return m_main_vga_lock; } + Spinlock& main_vga_lock() { return m_main_vga_lock; } RefPtr console() const { return m_console; } void deactivate_graphical_mode(); @@ -56,7 +56,7 @@ private: unsigned m_current_minor_number { 0 }; const bool m_framebuffer_devices_allowed; - Spinlock m_main_vga_lock; + Spinlock m_main_vga_lock; }; } diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h index b4a1a85253e..6db51e8005e 100644 --- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h +++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h @@ -161,9 +161,9 @@ private: Optional create_pll_settings(u64 target_frequency, u64 reference_clock, const PLLMaxSettings&); - Spinlock m_control_lock; - Spinlock m_modeset_lock; - mutable Spinlock m_registers_lock; + Spinlock m_control_lock; + Spinlock m_modeset_lock; + mutable Spinlock m_registers_lock; Graphics::VideoInfoBlock m_crt_edid; const PhysicalAddress m_registers; diff --git a/Kernel/Locking/Mutex.cpp b/Kernel/Locking/Mutex.cpp index 14ad0f70eda..b4f97ad2c74 100644 --- a/Kernel/Locking/Mutex.cpp +++ b/Kernel/Locking/Mutex.cpp @@ -200,7 +200,7 @@ void Mutex::unlock() } } -void Mutex::block(Thread& current_thread, Mode mode, SpinlockLocker>& lock, u32 requested_locks) +void Mutex::block(Thread& current_thread, Mode mode, SpinlockLocker& lock, u32 requested_locks) { if constexpr (LOCK_IN_CRITICAL_DEBUG) VERIFY_INTERRUPTS_ENABLED(); diff --git a/Kernel/Locking/Mutex.h b/Kernel/Locking/Mutex.h index 93c1e615b24..be9a547dfc8 100644 --- a/Kernel/Locking/Mutex.h +++ b/Kernel/Locking/Mutex.h @@ -77,7 +77,7 @@ private: return mode == Mode::Exclusive ? m_blocked_threads_list_exclusive : m_blocked_threads_list_shared; } - void block(Thread&, Mode, SpinlockLocker>&, u32); + void block(Thread&, Mode, SpinlockLocker&, u32); void unblock_waiters(Mode); StringView m_name; @@ -98,7 +98,7 @@ private: BlockedThreadList m_blocked_threads_list_exclusive; BlockedThreadList m_blocked_threads_list_shared; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; class MutexLocker { diff --git a/Kernel/Locking/Spinlock.h b/Kernel/Locking/Spinlock.h index 2c1808185a1..7e2843fd699 100644 --- a/Kernel/Locking/Spinlock.h +++ b/Kernel/Locking/Spinlock.h @@ -13,7 +13,6 @@ namespace Kernel { -template class Spinlock { AK_MAKE_NONCOPYABLE(Spinlock); AK_MAKE_NONMOVABLE(Spinlock); @@ -54,7 +53,7 @@ public: } private: - Atomic m_lock { 0 }; + Atomic m_lock { 0 }; }; class RecursiveSpinlock { diff --git a/Kernel/Memory/AnonymousVMObject.h b/Kernel/Memory/AnonymousVMObject.h index 4c839f7fc25..f0b308a3be8 100644 --- a/Kernel/Memory/AnonymousVMObject.h +++ b/Kernel/Memory/AnonymousVMObject.h @@ -76,7 +76,7 @@ private: void uncommit_one(); public: - Spinlock m_lock; + Spinlock m_lock; CommittedPhysicalPageSet m_committed_pages; }; diff --git a/Kernel/Memory/MemoryManager.h b/Kernel/Memory/MemoryManager.h index 17c4536fada..39f73443b04 100644 --- a/Kernel/Memory/MemoryManager.h +++ b/Kernel/Memory/MemoryManager.h @@ -93,7 +93,7 @@ struct PhysicalMemoryRange { struct MemoryManagerData { static ProcessorSpecificDataID processor_specific_data_id() { return ProcessorSpecificDataID::MemoryManager; } - Spinlock m_quickmap_in_use; + Spinlock m_quickmap_in_use; u32 m_quickmap_prev_flags; PhysicalAddress m_last_quickmap_pd; diff --git a/Kernel/Memory/RingBuffer.h b/Kernel/Memory/RingBuffer.h index 50a3afe3231..45338c51f05 100644 --- a/Kernel/Memory/RingBuffer.h +++ b/Kernel/Memory/RingBuffer.h @@ -23,7 +23,7 @@ public: void reclaim_space(PhysicalAddress chunk_start, size_t chunk_size); PhysicalAddress start_of_used() const; - Spinlock& lock() { return m_lock; } + Spinlock& lock() { return m_lock; } size_t used_bytes() const { return m_num_used_bytes; } PhysicalAddress start_of_region() const { return m_region->physical_page(0)->paddr(); } VirtualAddress vaddr() const { return m_region->vaddr(); } @@ -31,7 +31,7 @@ public: private: OwnPtr m_region; - Spinlock m_lock; + Spinlock m_lock; size_t m_start_of_used {}; size_t m_num_used_bytes {}; size_t m_capacity_in_bytes {}; diff --git a/Kernel/Memory/VirtualRangeAllocator.h b/Kernel/Memory/VirtualRangeAllocator.h index 5835e5a5435..7cd6c6e0691 100644 --- a/Kernel/Memory/VirtualRangeAllocator.h +++ b/Kernel/Memory/VirtualRangeAllocator.h @@ -35,7 +35,7 @@ private: RedBlackTree m_available_ranges; VirtualRange m_total_range; - mutable Spinlock m_lock; + mutable Spinlock m_lock; }; } diff --git a/Kernel/Process.h b/Kernel/Process.h index a556cc0ec8d..1a4dc0db148 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -681,7 +681,7 @@ public: private: FileDescriptions() = default; static constexpr size_t m_max_open_file_descriptors { FD_SETSIZE }; - mutable Spinlock m_fds_lock; + mutable Spinlock m_fds_lock; Vector m_fds_metadatas; }; @@ -782,7 +782,7 @@ private: OwnPtr m_perf_event_buffer; FutexQueues m_futex_queues; - Spinlock m_futex_lock; + Spinlock m_futex_lock; // This member is used in the implementation of ptrace's PT_TRACEME flag. // If it is set to true, the process will stop at the next execve syscall diff --git a/Kernel/ProcessExposed.cpp b/Kernel/ProcessExposed.cpp index e8a9cdc2185..9d157085fa0 100644 --- a/Kernel/ProcessExposed.cpp +++ b/Kernel/ProcessExposed.cpp @@ -15,7 +15,7 @@ namespace Kernel { -static Spinlock s_index_lock; +static Spinlock s_index_lock; static InodeIndex s_next_inode_index = 0; namespace SegmentedProcFSIndex { diff --git a/Kernel/Random.h b/Kernel/Random.h index 17a0e3e2eef..e2c788fb304 100644 --- a/Kernel/Random.h +++ b/Kernel/Random.h @@ -81,7 +81,7 @@ public: return is_seeded() || m_p0_len >= reseed_threshold; } - Spinlock& get_lock() { return m_lock; } + Spinlock& get_lock() { return m_lock; } private: void reseed() @@ -107,7 +107,7 @@ private: size_t m_p0_len { 0 }; ByteBuffer m_key; HashType m_pools[pool_count]; - Spinlock m_lock; + Spinlock m_lock; }; class KernelRng : public Lockable> { @@ -121,7 +121,7 @@ public: void wake_if_ready(); - Spinlock& get_lock() { return resource().get_lock(); } + Spinlock& get_lock() { return resource().get_lock(); } private: WaitQueue m_seed_queue; diff --git a/Kernel/Storage/AHCIPort.cpp b/Kernel/Storage/AHCIPort.cpp index 6e176fee0e9..0d54f409bec 100644 --- a/Kernel/Storage/AHCIPort.cpp +++ b/Kernel/Storage/AHCIPort.cpp @@ -238,7 +238,7 @@ bool AHCIPort::initialize_without_reset() return initialize(lock); } -bool AHCIPort::initialize(SpinlockLocker>& main_lock) +bool AHCIPort::initialize(SpinlockLocker& main_lock) { VERIFY(m_lock.is_locked()); dbgln_if(AHCI_DEBUG, "AHCI Port {}: Initialization. Signature = {:#08x}", representative_port_index(), static_cast(m_port_registers.sig)); @@ -591,7 +591,7 @@ bool AHCIPort::access_device(AsyncBlockDeviceRequest::RequestType direction, u64 return true; } -bool AHCIPort::identify_device(SpinlockLocker>& main_lock) +bool AHCIPort::identify_device(SpinlockLocker& main_lock) { VERIFY(m_lock.is_locked()); VERIFY(is_operable()); @@ -740,7 +740,7 @@ void AHCIPort::stop_fis_receiving() const m_port_registers.cmd = m_port_registers.cmd & 0xFFFFFFEF; } -bool AHCIPort::initiate_sata_reset(SpinlockLocker>& main_lock) +bool AHCIPort::initiate_sata_reset(SpinlockLocker& main_lock) { VERIFY(m_lock.is_locked()); VERIFY(m_hard_lock.is_locked()); diff --git a/Kernel/Storage/AHCIPort.h b/Kernel/Storage/AHCIPort.h index 4da795dce67..a0f9146773d 100644 --- a/Kernel/Storage/AHCIPort.h +++ b/Kernel/Storage/AHCIPort.h @@ -51,7 +51,7 @@ public: private: bool is_phy_enabled() const { return (m_port_registers.ssts & 0xf) == 3; } - bool initialize(SpinlockLocker>&); + bool initialize(SpinlockLocker&); UNMAP_AFTER_INIT AHCIPort(const AHCIPortHandler&, volatile AHCI::PortRegisters&, u32 port_index); @@ -62,7 +62,7 @@ private: const char* try_disambiguate_sata_status(); void try_disambiguate_sata_error(); - bool initiate_sata_reset(SpinlockLocker>&); + bool initiate_sata_reset(SpinlockLocker&); void rebase(); void recover_from_fatal_error(); bool shutdown(); @@ -79,7 +79,7 @@ private: bool spin_until_ready() const; - bool identify_device(SpinlockLocker>&); + bool identify_device(SpinlockLocker&); ALWAYS_INLINE void start_command_list_processing() const; ALWAYS_INLINE void mark_command_header_ready_to_process(u8 command_header_index) const; @@ -101,7 +101,7 @@ private: EntropySource m_entropy_source; RefPtr m_current_request; - Spinlock m_hard_lock; + Spinlock m_hard_lock; Mutex m_lock { "AHCIPort" }; mutable bool m_wait_for_completion { false }; diff --git a/Kernel/Storage/IDEChannel.h b/Kernel/Storage/IDEChannel.h index 976dc5abbf5..83fe5d3aa3e 100644 --- a/Kernel/Storage/IDEChannel.h +++ b/Kernel/Storage/IDEChannel.h @@ -157,7 +157,7 @@ protected: RefPtr m_current_request; u64 m_current_request_block_index { 0 }; bool m_current_request_flushing_cache { false }; - Spinlock m_request_lock; + Spinlock m_request_lock; Mutex m_lock { "IDEChannel" }; IOAddressGroup m_io_group; diff --git a/Kernel/TTY/ConsoleManagement.h b/Kernel/TTY/ConsoleManagement.h index 847eaaf2744..e19febab588 100644 --- a/Kernel/TTY/ConsoleManagement.h +++ b/Kernel/TTY/ConsoleManagement.h @@ -40,7 +40,7 @@ public: private: NonnullRefPtrVector m_consoles; VirtualConsole* m_active_console { nullptr }; - Spinlock m_lock; + Spinlock m_lock; RecursiveSpinlock m_tty_write_lock; }; diff --git a/Kernel/Thread.cpp b/Kernel/Thread.cpp index 78852033a1c..237eb5d8242 100644 --- a/Kernel/Thread.cpp +++ b/Kernel/Thread.cpp @@ -151,7 +151,7 @@ Thread::~Thread() } } -void Thread::block(Kernel::Mutex& lock, SpinlockLocker>& lock_lock, u32 lock_count) +void Thread::block(Kernel::Mutex& lock, SpinlockLocker& lock_lock, u32 lock_count) { VERIFY(!Processor::current_in_irq()); VERIFY(this == Thread::current()); diff --git a/Kernel/Thread.h b/Kernel/Thread.h index 6644abb42a2..e7470ac023d 100644 --- a/Kernel/Thread.h +++ b/Kernel/Thread.h @@ -507,7 +507,7 @@ public: blockers_to_append.clear(); } - mutable Spinlock m_lock; + mutable Spinlock m_lock; private: Vector m_blockers; @@ -831,7 +831,7 @@ public: } } - void block(Kernel::Mutex&, SpinlockLocker>&, u32); + void block(Kernel::Mutex&, SpinlockLocker&, u32); template [[nodiscard]] BlockResult block(const BlockTimeout& timeout, Args&&... args) @@ -1307,7 +1307,7 @@ private: unsigned count; }; Atomic m_holding_locks { 0 }; - Spinlock m_holding_locks_lock; + Spinlock m_holding_locks_lock; Vector m_holding_locks_list; #endif diff --git a/Kernel/TimerQueue.cpp b/Kernel/TimerQueue.cpp index f2217d4f66c..1f301c63b06 100644 --- a/Kernel/TimerQueue.cpp +++ b/Kernel/TimerQueue.cpp @@ -14,7 +14,7 @@ namespace Kernel { static Singleton s_the; -static Spinlock g_timerqueue_lock; +static Spinlock g_timerqueue_lock; Time Timer::remaining() const { diff --git a/Kernel/WorkQueue.h b/Kernel/WorkQueue.h index f405bb3725a..21e45f8f494 100644 --- a/Kernel/WorkQueue.h +++ b/Kernel/WorkQueue.h @@ -52,7 +52,7 @@ private: RefPtr m_thread; WaitQueue m_wait_queue; IntrusiveList, &WorkItem::m_node> m_items; - Spinlock m_lock; + Spinlock m_lock; }; }