diff --git a/Kernel/Storage/StorageManagement.cpp b/Kernel/Storage/StorageManagement.cpp index 8090270d2e..fdbee54975 100644 --- a/Kernel/Storage/StorageManagement.cpp +++ b/Kernel/Storage/StorageManagement.cpp @@ -59,7 +59,7 @@ bool StorageManagement::boot_argument_contains_partition_uuid() return m_boot_argument.starts_with("PARTUUID="); } -NonnullRefPtrVector StorageManagement::enumerate_controllers(bool force_pio) const +UNMAP_AFTER_INIT NonnullRefPtrVector StorageManagement::enumerate_controllers(bool force_pio) const { NonnullRefPtrVector controllers; if (kernel_command_line().is_ide_enabled()) { @@ -73,7 +73,7 @@ NonnullRefPtrVector StorageManagement::enumerate_controllers( return controllers; } -NonnullRefPtrVector StorageManagement::enumerate_storage_devices() const +UNMAP_AFTER_INIT NonnullRefPtrVector StorageManagement::enumerate_storage_devices() const { VERIFY(!m_controllers.is_empty()); NonnullRefPtrVector devices; @@ -88,7 +88,7 @@ NonnullRefPtrVector StorageManagement::enumerate_storage_devices( return devices; } -OwnPtr StorageManagement::try_to_initialize_partition_table(const StorageDevice& device) const +UNMAP_AFTER_INIT OwnPtr StorageManagement::try_to_initialize_partition_table(const StorageDevice& device) const { auto mbr_table_or_result = MBRPartitionTable::try_to_initialize(device); if (!mbr_table_or_result.is_error()) @@ -108,7 +108,7 @@ OwnPtr StorageManagement::try_to_initialize_partition_table(cons return {}; } -NonnullRefPtrVector StorageManagement::enumerate_disk_partitions() const +UNMAP_AFTER_INIT NonnullRefPtrVector StorageManagement::enumerate_disk_partitions() const { VERIFY(!m_storage_devices.is_empty()); NonnullRefPtrVector partitions; @@ -131,7 +131,7 @@ NonnullRefPtrVector StorageManagement::enumerate_disk_partitions( return partitions; } -void StorageManagement::determine_boot_device() +UNMAP_AFTER_INIT void StorageManagement::determine_boot_device() { VERIFY(!m_controllers.is_empty()); if (m_boot_argument.starts_with("/dev/")) { @@ -151,7 +151,7 @@ void StorageManagement::determine_boot_device() } } -void StorageManagement::determine_boot_device_with_partition_uuid() +UNMAP_AFTER_INIT void StorageManagement::determine_boot_device_with_partition_uuid() { VERIFY(!m_disk_partitions.is_empty()); VERIFY(m_boot_argument.starts_with("PARTUUID=")); diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp index 4267de7487..2c6336626c 100644 --- a/Kernel/Time/TimeManagement.cpp +++ b/Kernel/Time/TimeManagement.cpp @@ -219,7 +219,7 @@ Time TimeManagement::now() return s_the.ptr()->epoch_time(); } -Vector TimeManagement::scan_and_initialize_periodic_timers() +UNMAP_AFTER_INIT Vector TimeManagement::scan_and_initialize_periodic_timers() { bool should_enable = is_hpet_periodic_mode_allowed(); dbgln("Time: Scanning for periodic timers"); @@ -234,7 +234,7 @@ Vector TimeManagement::scan_and_initialize_periodic_timers() return timers; } -Vector TimeManagement::scan_for_non_periodic_timers() +UNMAP_AFTER_INIT Vector TimeManagement::scan_for_non_periodic_timers() { dbgln("Time: Scanning for non-periodic timers"); Vector timers;