diff --git a/AK/kmalloc.h b/AK/kmalloc.h index 0a8a220045a..b60539da598 100644 --- a/AK/kmalloc.h +++ b/AK/kmalloc.h @@ -38,17 +38,6 @@ inline size_t malloc_good_size(size_t size) { return size; } # endif #endif -#ifdef KERNEL -# define AK_MAKE_ETERNAL \ - public: \ - void* operator new(size_t size) { return kmalloc_eternal(size); } \ - void operator delete(void*, size_t) { VERIFY_NOT_REACHED(); } \ - \ - private: -#else -# define AK_MAKE_ETERNAL -#endif - using std::nothrow; inline void* kmalloc_array(Checked a, Checked b) diff --git a/Kernel/Bus/USB/USBManagement.h b/Kernel/Bus/USB/USBManagement.h index 0219c13350e..b275facc8ed 100644 --- a/Kernel/Bus/USB/USBManagement.h +++ b/Kernel/Bus/USB/USBManagement.h @@ -13,7 +13,6 @@ namespace Kernel::USB { class USBManagement { - AK_MAKE_ETERNAL; public: USBManagement(); diff --git a/Kernel/CommandLine.h b/Kernel/CommandLine.h index e6b29f38a42..fe373d519a4 100644 --- a/Kernel/CommandLine.h +++ b/Kernel/CommandLine.h @@ -42,7 +42,6 @@ enum class AHCIResetMode { }; class CommandLine { - AK_MAKE_ETERNAL; public: static void early_initialize(const char* cmd_line); diff --git a/Kernel/Devices/ConsoleDevice.h b/Kernel/Devices/ConsoleDevice.h index 0309e28ff0a..1c2e05fae8e 100644 --- a/Kernel/Devices/ConsoleDevice.h +++ b/Kernel/Devices/ConsoleDevice.h @@ -13,7 +13,6 @@ namespace Kernel { class ConsoleDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/DeviceManagement.h b/Kernel/Devices/DeviceManagement.h index 9055ce126e2..18431232fd9 100644 --- a/Kernel/Devices/DeviceManagement.h +++ b/Kernel/Devices/DeviceManagement.h @@ -24,7 +24,6 @@ namespace Kernel { class DeviceManagement { - AK_MAKE_ETERNAL; public: DeviceManagement(); diff --git a/Kernel/Devices/FullDevice.h b/Kernel/Devices/FullDevice.h index b9ae0432b7c..e7a5412ef68 100644 --- a/Kernel/Devices/FullDevice.h +++ b/Kernel/Devices/FullDevice.h @@ -11,7 +11,6 @@ namespace Kernel { class FullDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/HID/HIDManagement.h b/Kernel/Devices/HID/HIDManagement.h index 667acd7cf1f..e5a48442a81 100644 --- a/Kernel/Devices/HID/HIDManagement.h +++ b/Kernel/Devices/HID/HIDManagement.h @@ -31,7 +31,6 @@ class KeyboardClient; class HIDManagement { friend class KeyboardDevice; friend class MouseDevice; - AK_MAKE_ETERNAL; public: HIDManagement(); diff --git a/Kernel/Devices/KCOVDevice.h b/Kernel/Devices/KCOVDevice.h index 3535752c717..2977704b9a6 100644 --- a/Kernel/Devices/KCOVDevice.h +++ b/Kernel/Devices/KCOVDevice.h @@ -11,7 +11,6 @@ namespace Kernel { class KCOVDevice final : public BlockDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/MemoryDevice.h b/Kernel/Devices/MemoryDevice.h index 568899ad19a..3e88b998392 100644 --- a/Kernel/Devices/MemoryDevice.h +++ b/Kernel/Devices/MemoryDevice.h @@ -13,7 +13,6 @@ namespace Kernel { class MemoryDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/NullDevice.h b/Kernel/Devices/NullDevice.h index e95c0cd51f7..661c3deab4c 100644 --- a/Kernel/Devices/NullDevice.h +++ b/Kernel/Devices/NullDevice.h @@ -11,7 +11,6 @@ namespace Kernel { class NullDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/PCISerialDevice.cpp b/Kernel/Devices/PCISerialDevice.cpp index c89d80427fd..76580887692 100644 --- a/Kernel/Devices/PCISerialDevice.cpp +++ b/Kernel/Devices/PCISerialDevice.cpp @@ -30,7 +30,7 @@ UNMAP_AFTER_INIT void PCISerialDevice::detect() // If this is the first port of the first pci serial device, store it as the debug PCI serial port (TODO: Make this configurable somehow?) if (!is_available()) s_the = serial_device; - // NOTE: We intentionally leak the reference to serial_device here, as it is eternal + // NOTE: We intentionally leak the reference to serial_device here. } dmesgln("PCISerialDevice: Found {} @ {}", board_definition.name, device_identifier.address()); diff --git a/Kernel/Devices/PCISerialDevice.h b/Kernel/Devices/PCISerialDevice.h index c36a26f84c2..f92ef97ab83 100644 --- a/Kernel/Devices/PCISerialDevice.h +++ b/Kernel/Devices/PCISerialDevice.h @@ -14,7 +14,6 @@ namespace Kernel { class PCISerialDevice { - AK_MAKE_ETERNAL public: static void detect(); static SerialDevice& the(); diff --git a/Kernel/Devices/RandomDevice.h b/Kernel/Devices/RandomDevice.h index cd1ebc08f83..2e6639c7a6c 100644 --- a/Kernel/Devices/RandomDevice.h +++ b/Kernel/Devices/RandomDevice.h @@ -11,7 +11,6 @@ namespace Kernel { class RandomDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/SerialDevice.h b/Kernel/Devices/SerialDevice.h index 221597f4ab5..84f8c968a15 100644 --- a/Kernel/Devices/SerialDevice.h +++ b/Kernel/Devices/SerialDevice.h @@ -12,7 +12,6 @@ namespace Kernel { class SerialDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Devices/VMWareBackdoor.h b/Kernel/Devices/VMWareBackdoor.h index c8fd80bf355..a76aa8d8a2f 100644 --- a/Kernel/Devices/VMWareBackdoor.h +++ b/Kernel/Devices/VMWareBackdoor.h @@ -39,7 +39,6 @@ struct VMWareCommand { }; class VMWareBackdoor { - AK_MAKE_ETERNAL; public: VMWareBackdoor(); diff --git a/Kernel/Devices/ZeroDevice.h b/Kernel/Devices/ZeroDevice.h index d5c627d1418..07f19ef29e5 100644 --- a/Kernel/Devices/ZeroDevice.h +++ b/Kernel/Devices/ZeroDevice.h @@ -11,7 +11,6 @@ namespace Kernel { class ZeroDevice final : public CharacterDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/FileSystem/VirtualFileSystem.h b/Kernel/FileSystem/VirtualFileSystem.h index edecba50e82..bee3f1504fb 100644 --- a/Kernel/FileSystem/VirtualFileSystem.h +++ b/Kernel/FileSystem/VirtualFileSystem.h @@ -33,7 +33,6 @@ struct UidAndGid { }; class VirtualFileSystem { - AK_MAKE_ETERNAL public: // Required to be at least 8 by POSIX // https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp index 284975ab28b..245b57184ea 100644 --- a/Kernel/GlobalProcessExposed.cpp +++ b/Kernel/GlobalProcessExposed.cpp @@ -403,7 +403,6 @@ private: JsonObjectSerializer json { builder }; json.add("kmalloc_allocated", stats.bytes_allocated); json.add("kmalloc_available", stats.bytes_free); - json.add("kmalloc_eternal_allocated", stats.bytes_eternal); json.add("user_physical_allocated", system_memory.user_physical_pages_used); json.add("user_physical_available", system_memory.user_physical_pages - system_memory.user_physical_pages_used); json.add("user_physical_committed", system_memory.user_physical_pages_committed); diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.h b/Kernel/Graphics/Bochs/GraphicsAdapter.h index d700f4c6553..550d490980e 100644 --- a/Kernel/Graphics/Bochs/GraphicsAdapter.h +++ b/Kernel/Graphics/Bochs/GraphicsAdapter.h @@ -21,7 +21,6 @@ struct BochsDisplayMMIORegisters; class BochsGraphicsAdapter final : public GenericGraphicsAdapter , public PCI::Device { - AK_MAKE_ETERNAL friend class GraphicsManagement; private: diff --git a/Kernel/Graphics/FramebufferDevice.h b/Kernel/Graphics/FramebufferDevice.h index 4f79140e356..a81f2d10117 100644 --- a/Kernel/Graphics/FramebufferDevice.h +++ b/Kernel/Graphics/FramebufferDevice.h @@ -17,7 +17,6 @@ namespace Kernel { class FramebufferDevice final : public GenericFramebufferDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Graphics/GenericFramebufferDevice.h b/Kernel/Graphics/GenericFramebufferDevice.h index f1aca10fd8b..93435221bb3 100644 --- a/Kernel/Graphics/GenericFramebufferDevice.h +++ b/Kernel/Graphics/GenericFramebufferDevice.h @@ -16,7 +16,6 @@ namespace Kernel { class GenericFramebufferDevice : public BlockDevice { - AK_MAKE_ETERNAL friend class DeviceManagement; public: diff --git a/Kernel/Graphics/GraphicsManagement.h b/Kernel/Graphics/GraphicsManagement.h index 55881588636..a89166c56e4 100644 --- a/Kernel/Graphics/GraphicsManagement.h +++ b/Kernel/Graphics/GraphicsManagement.h @@ -27,7 +27,6 @@ class GraphicsManagement { friend class IntelNativeGraphicsAdapter; friend class VGACompatibleAdapter; friend class Graphics::VirtIOGPU::GraphicsAdapter; - AK_MAKE_ETERNAL public: static GraphicsManagement& the(); diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h index d0864e30c6e..3aa0200b854 100644 --- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h +++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h @@ -47,7 +47,6 @@ enum RegisterIndex { class IntelNativeGraphicsAdapter final : public VGACompatibleAdapter { - AK_MAKE_ETERNAL public: struct PLLSettings { bool is_valid() const { return (n != 0 && m1 != 0 && m2 != 0 && p1 != 0 && p2 != 0); } diff --git a/Kernel/Graphics/VGACompatibleAdapter.h b/Kernel/Graphics/VGACompatibleAdapter.h index 7ee2b144a59..efbe53e47a4 100644 --- a/Kernel/Graphics/VGACompatibleAdapter.h +++ b/Kernel/Graphics/VGACompatibleAdapter.h @@ -17,7 +17,6 @@ namespace Kernel { class VGACompatibleAdapter : public GenericGraphicsAdapter , public PCI::Device { - AK_MAKE_ETERNAL public: static NonnullRefPtr initialize_with_preset_resolution(PCI::DeviceIdentifier const&, PhysicalAddress, size_t framebuffer_width, size_t framebuffer_height, size_t framebuffer_pitch); static NonnullRefPtr initialize(PCI::DeviceIdentifier const&); diff --git a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h index 95ae267eed4..2dd0a1ad570 100644 --- a/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h +++ b/Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h @@ -35,7 +35,6 @@ class FramebufferDevice; class GraphicsAdapter final : public GenericGraphicsAdapter , public VirtIO::Device { - AK_MAKE_ETERNAL friend class FramebufferDevice; public: diff --git a/Kernel/Heap/kmalloc.cpp b/Kernel/Heap/kmalloc.cpp index 1d82053781d..68443886fde 100644 --- a/Kernel/Heap/kmalloc.cpp +++ b/Kernel/Heap/kmalloc.cpp @@ -29,7 +29,6 @@ static constexpr size_t CHUNK_SIZE = 64; #endif #define POOL_SIZE (2 * MiB) -#define ETERNAL_RANGE_SIZE (4 * MiB) namespace std { const nothrow_t nothrow; @@ -307,18 +306,13 @@ READONLY_AFTER_INIT static KmallocGlobalData* g_kmalloc_global; alignas(KmallocGlobalData) static u8 g_kmalloc_global_heap[sizeof(KmallocGlobalData)]; // Treat the heap as logically separate from .bss -__attribute__((section(".heap"))) static u8 kmalloc_eternal_heap[ETERNAL_RANGE_SIZE]; __attribute__((section(".heap"))) static u8 kmalloc_pool_heap[POOL_SIZE]; -static size_t g_kmalloc_bytes_eternal = 0; static size_t g_kmalloc_call_count; static size_t g_kfree_call_count; static size_t g_nested_kfree_calls; bool g_dump_kmalloc_stacks; -static u8* s_next_eternal_ptr; -READONLY_AFTER_INIT static u8* s_end_of_eternal_range; - void kmalloc_enable_expand() { g_kmalloc_global->enable_expansion(); @@ -335,28 +329,10 @@ static inline void kmalloc_verify_nospinlock_held() UNMAP_AFTER_INIT void kmalloc_init() { // Zero out heap since it's placed after end_of_kernel_bss. - memset(kmalloc_eternal_heap, 0, sizeof(kmalloc_eternal_heap)); memset(kmalloc_pool_heap, 0, sizeof(kmalloc_pool_heap)); g_kmalloc_global = new (g_kmalloc_global_heap) KmallocGlobalData(kmalloc_pool_heap, sizeof(kmalloc_pool_heap)); s_lock.initialize(); - - s_next_eternal_ptr = kmalloc_eternal_heap; - s_end_of_eternal_range = s_next_eternal_ptr + sizeof(kmalloc_eternal_heap); -} - -void* kmalloc_eternal(size_t size) -{ - kmalloc_verify_nospinlock_held(); - - size = round_up_to_power_of_two(size, sizeof(void*)); - - SpinlockLocker lock(s_lock); - void* ptr = s_next_eternal_ptr; - s_next_eternal_ptr += size; - VERIFY(s_next_eternal_ptr < s_end_of_eternal_range); - g_kmalloc_bytes_eternal += size; - return ptr; } void* kmalloc(size_t size) @@ -493,7 +469,6 @@ void get_kmalloc_stats(kmalloc_stats& stats) SpinlockLocker lock(s_lock); stats.bytes_allocated = g_kmalloc_global->allocated_bytes(); stats.bytes_free = g_kmalloc_global->free_bytes(); - stats.bytes_eternal = g_kmalloc_bytes_eternal; stats.kmalloc_call_count = g_kmalloc_call_count; stats.kfree_call_count = g_kfree_call_count; } diff --git a/Kernel/Heap/kmalloc.h b/Kernel/Heap/kmalloc.h index c91bb28446a..5cff42f1463 100644 --- a/Kernel/Heap/kmalloc.h +++ b/Kernel/Heap/kmalloc.h @@ -39,14 +39,12 @@ enum class align_val_t : size_t {}; }; void kmalloc_init(); -[[gnu::malloc, gnu::returns_nonnull, gnu::alloc_size(1)]] void* kmalloc_eternal(size_t); void kfree_sized(void*, size_t); struct kmalloc_stats { size_t bytes_allocated; size_t bytes_free; - size_t bytes_eternal; size_t kmalloc_call_count; size_t kfree_call_count; }; diff --git a/Kernel/KSyms.cpp b/Kernel/KSyms.cpp index e686f8f577a..171528c0be0 100644 --- a/Kernel/KSyms.cpp +++ b/Kernel/KSyms.cpp @@ -65,7 +65,7 @@ UNMAP_AFTER_INIT static void load_kernel_symbols_from_data(Bytes buffer) for (size_t i = 0; i < 8; ++i) s_symbol_count = (s_symbol_count << 4) | parse_hex_digit(*(bufptr++)); - s_symbols = static_cast(kmalloc_eternal(sizeof(KernelSymbol) * s_symbol_count)); + s_symbols = static_cast(kmalloc(sizeof(KernelSymbol) * s_symbol_count)); ++bufptr; // skip newline dmesgln("Loading kernel symbol table..."); diff --git a/Kernel/Memory/MemoryManager.h b/Kernel/Memory/MemoryManager.h index ccf058fc548..4fc46ea2c9d 100644 --- a/Kernel/Memory/MemoryManager.h +++ b/Kernel/Memory/MemoryManager.h @@ -137,7 +137,6 @@ private: }; class MemoryManager { - AK_MAKE_ETERNAL friend class PageDirectory; friend class AnonymousVMObject; friend class Region; diff --git a/Kernel/Memory/PhysicalRegion.h b/Kernel/Memory/PhysicalRegion.h index 2de2b2f3ae6..19c527f7f1b 100644 --- a/Kernel/Memory/PhysicalRegion.h +++ b/Kernel/Memory/PhysicalRegion.h @@ -13,7 +13,6 @@ namespace Kernel::Memory { class PhysicalRegion { - AK_MAKE_ETERNAL; AK_MAKE_NONCOPYABLE(PhysicalRegion); AK_MAKE_NONMOVABLE(PhysicalRegion); diff --git a/Kernel/Memory/PhysicalZone.h b/Kernel/Memory/PhysicalZone.h index 5f0a2fae1e1..964d642b627 100644 --- a/Kernel/Memory/PhysicalZone.h +++ b/Kernel/Memory/PhysicalZone.h @@ -17,7 +17,6 @@ namespace Kernel::Memory { // The allocator uses a buddy block scheme internally. class PhysicalZone { - AK_MAKE_ETERNAL; AK_MAKE_NONCOPYABLE(PhysicalZone); AK_MAKE_NONMOVABLE(PhysicalZone); diff --git a/Kernel/Net/LoopbackAdapter.h b/Kernel/Net/LoopbackAdapter.h index b4352fc3f92..20b50cf5e47 100644 --- a/Kernel/Net/LoopbackAdapter.h +++ b/Kernel/Net/LoopbackAdapter.h @@ -11,8 +11,6 @@ namespace Kernel { class LoopbackAdapter final : public NetworkAdapter { - AK_MAKE_ETERNAL - private: LoopbackAdapter(NonnullOwnPtr); diff --git a/Kernel/Net/NetworkingManagement.h b/Kernel/Net/NetworkingManagement.h index f2feb641fd7..78c55e5beab 100644 --- a/Kernel/Net/NetworkingManagement.h +++ b/Kernel/Net/NetworkingManagement.h @@ -20,7 +20,6 @@ namespace Kernel { class NetworkAdapter; class NetworkingManagement { friend class NetworkAdapter; - AK_MAKE_ETERNAL public: static NetworkingManagement& the(); diff --git a/Kernel/Random.h b/Kernel/Random.h index dc7ae70436f..e5f4a61fd60 100644 --- a/Kernel/Random.h +++ b/Kernel/Random.h @@ -120,7 +120,6 @@ private: }; class KernelRng : public FortunaPRNG { - AK_MAKE_ETERNAL; public: KernelRng(); diff --git a/Kernel/Storage/ATA/AHCIController.h b/Kernel/Storage/ATA/AHCIController.h index 726696949d9..f59603a1f1c 100644 --- a/Kernel/Storage/ATA/AHCIController.h +++ b/Kernel/Storage/ATA/AHCIController.h @@ -23,7 +23,7 @@ class AHCIController final : public ATAController , public PCI::Device { friend class AHCIPortHandler; friend class AHCIPort; - AK_MAKE_ETERNAL + public: UNMAP_AFTER_INIT static NonnullRefPtr initialize(PCI::DeviceIdentifier const& pci_device_identifier); virtual ~AHCIController() override; diff --git a/Kernel/Storage/ATA/IDEChannel.h b/Kernel/Storage/ATA/IDEChannel.h index ec14e00f7d0..65dc804f8a6 100644 --- a/Kernel/Storage/ATA/IDEChannel.h +++ b/Kernel/Storage/ATA/IDEChannel.h @@ -37,7 +37,7 @@ class IDEController; class IDEChannel : public RefCounted , public IRQHandler { friend class IDEController; - AK_MAKE_ETERNAL + public: enum class ChannelType : u8 { Primary, diff --git a/Kernel/Storage/ATA/IDEController.h b/Kernel/Storage/ATA/IDEController.h index cea3540e9fa..f1f49c5baaa 100644 --- a/Kernel/Storage/ATA/IDEController.h +++ b/Kernel/Storage/ATA/IDEController.h @@ -19,7 +19,6 @@ class AsyncBlockDeviceRequest; class IDEController final : public ATAController , public PCI::Device { - AK_MAKE_ETERNAL public: static NonnullRefPtr initialize(PCI::DeviceIdentifier const&, bool force_pio); virtual ~IDEController() override; diff --git a/Kernel/Storage/RamdiskController.h b/Kernel/Storage/RamdiskController.h index e15a8344442..28a09816f70 100644 --- a/Kernel/Storage/RamdiskController.h +++ b/Kernel/Storage/RamdiskController.h @@ -18,7 +18,6 @@ namespace Kernel { class AsyncBlockDeviceRequest; class RamdiskController final : public StorageController { - AK_MAKE_ETERNAL public: public: static NonnullRefPtr initialize(); diff --git a/Kernel/Storage/RamdiskDevice.h b/Kernel/Storage/RamdiskDevice.h index 235bed1b7b9..7d611cfdc9c 100644 --- a/Kernel/Storage/RamdiskDevice.h +++ b/Kernel/Storage/RamdiskDevice.h @@ -16,7 +16,7 @@ class RamdiskController; class RamdiskDevice final : public StorageDevice { friend class RamdiskController; friend class DeviceManagement; - AK_MAKE_ETERNAL + public: static NonnullRefPtr create(const RamdiskController&, NonnullOwnPtr&& region, int major, int minor); virtual ~RamdiskDevice() override; diff --git a/Kernel/Storage/StorageController.h b/Kernel/Storage/StorageController.h index 49f2657aa6e..e99674abdf6 100644 --- a/Kernel/Storage/StorageController.h +++ b/Kernel/Storage/StorageController.h @@ -22,7 +22,6 @@ namespace Kernel { class AsyncBlockDeviceRequest; class StorageDevice; class StorageController : public RefCounted { - AK_MAKE_ETERNAL public: virtual ~StorageController() = default; diff --git a/Kernel/Storage/StorageManagement.h b/Kernel/Storage/StorageManagement.h index 131d23b90bb..2acf7ecaeb1 100644 --- a/Kernel/Storage/StorageManagement.h +++ b/Kernel/Storage/StorageManagement.h @@ -19,7 +19,6 @@ namespace Kernel { class PartitionTable; class StorageManagement { - AK_MAKE_ETERNAL; public: StorageManagement(); diff --git a/Kernel/TTY/ConsoleManagement.h b/Kernel/TTY/ConsoleManagement.h index e19febab588..66afefa5420 100644 --- a/Kernel/TTY/ConsoleManagement.h +++ b/Kernel/TTY/ConsoleManagement.h @@ -14,7 +14,6 @@ namespace Kernel { class ConsoleManagement { - AK_MAKE_ETERNAL; friend class VirtualConsole; public: diff --git a/Kernel/TTY/PTYMultiplexer.h b/Kernel/TTY/PTYMultiplexer.h index 7b9b3ff150d..3a7ea9beb47 100644 --- a/Kernel/TTY/PTYMultiplexer.h +++ b/Kernel/TTY/PTYMultiplexer.h @@ -15,7 +15,6 @@ namespace Kernel { class MasterPTY; class PTYMultiplexer final : public CharacterDevice { - AK_MAKE_ETERNAL public: PTYMultiplexer(); virtual ~PTYMultiplexer() override; diff --git a/Kernel/TTY/VirtualConsole.h b/Kernel/TTY/VirtualConsole.h index e7182157188..4cb4bf4c905 100644 --- a/Kernel/TTY/VirtualConsole.h +++ b/Kernel/TTY/VirtualConsole.h @@ -47,7 +47,6 @@ private: class VirtualConsole final : public TTY , public KeyboardClient , public VT::TerminalClient { - AK_MAKE_ETERNAL friend class ConsoleManagement; friend class DeviceManagement; friend class ConsoleImpl; diff --git a/Kernel/Time/TimeManagement.h b/Kernel/Time/TimeManagement.h index 12cca4ef611..996dedbcdd1 100644 --- a/Kernel/Time/TimeManagement.h +++ b/Kernel/Time/TimeManagement.h @@ -29,7 +29,6 @@ enum class TimePrecision { }; class TimeManagement { - AK_MAKE_ETERNAL; public: TimeManagement(); diff --git a/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp index e9df986b3c7..a197e1eadb7 100644 --- a/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp +++ b/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp @@ -87,7 +87,6 @@ void MemoryStatsWidget::refresh() auto json_result = JsonValue::from_string(file_contents).release_value_but_fixme_should_propagate_errors(); auto const& json = json_result.as_object(); - [[maybe_unused]] u32 kmalloc_eternal_allocated = json.get("kmalloc_eternal_allocated").to_u32(); u32 kmalloc_allocated = json.get("kmalloc_allocated").to_u32(); u32 kmalloc_available = json.get("kmalloc_available").to_u32(); u64 user_physical_allocated = json.get("user_physical_allocated").to_u64();