diff options
| author | Liav A <liavalb@gmail.com> | 2022-10-04 03:05:54 +0300 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-12-28 11:53:41 +0100 |
| commit | 5ff318cf3ac7d12470c357ba0bac8cd7ffa10e3e (patch) | |
| tree | 36b3982d64e9602e80f990ed86790d8868827998 /Kernel/Time | |
| parent | 32270dcd20344ae2cd753232634cdcd4f0a4300e (diff) | |
| download | serenity-5ff318cf3ac7d12470c357ba0bac8cd7ffa10e3e.zip | |
Kernel: Remove i686 support
Diffstat (limited to 'Kernel/Time')
| -rw-r--r-- | Kernel/Time/TimeManagement.cpp | 13 | ||||
| -rw-r--r-- | Kernel/Time/TimeManagement.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp index 33fe9f2570..74d1a4c3d8 100644 --- a/Kernel/Time/TimeManagement.cpp +++ b/Kernel/Time/TimeManagement.cpp @@ -8,8 +8,7 @@ #include <AK/Singleton.h> #include <AK/StdLibExtras.h> #include <AK/Time.h> - -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) # include <Kernel/Arch/x86/Time/APICTimer.h> # include <Kernel/Arch/x86/Time/HPET.h> # include <Kernel/Arch/x86/Time/HPETComparator.h> @@ -125,7 +124,7 @@ Time TimeManagement::monotonic_time(TimePrecision precision) const ticks = m_ticks_this_second; if (do_query) { -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) // We may have to do this over again if the timer interrupt fires // while we're trying to query the information. In that case, our // seconds and ticks became invalid, producing an incorrect time. @@ -176,7 +175,7 @@ UNMAP_AFTER_INIT void TimeManagement::initialize([[maybe_unused]] u32 cpu) // the TimeManagement class is completely initialized. InterruptDisabler disabler; -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) if (cpu == 0) { VERIFY(!s_the.is_initialized()); s_the.ensure_instance(); @@ -229,7 +228,7 @@ time_t TimeManagement::ticks_per_second() const Time TimeManagement::boot_time() { -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) return RTC::boot_time(); #elif ARCH(AARCH64) TODO_AARCH64(); @@ -241,7 +240,7 @@ Time TimeManagement::boot_time() UNMAP_AFTER_INIT TimeManagement::TimeManagement() : m_time_page_region(MM.allocate_kernel_region(PAGE_SIZE, "Time page"sv, Memory::Region::Access::ReadWrite, AllocationStrategy::AllocateNow).release_value_but_fixme_should_propagate_errors()) { -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) bool probe_non_legacy_hardware_timers = !(kernel_command_line().is_legacy_time_enabled()); if (ACPI::is_enabled()) { if (!ACPI::Parser::the()->x86_specific_flags().cmos_rtc_not_present) { @@ -312,7 +311,7 @@ bool TimeManagement::is_hpet_periodic_mode_allowed() } } -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) UNMAP_AFTER_INIT bool TimeManagement::probe_and_set_x86_non_legacy_hardware_timers() { if (!ACPI::is_enabled()) diff --git a/Kernel/Time/TimeManagement.h b/Kernel/Time/TimeManagement.h index ce06e617ea..afcf58333f 100644 --- a/Kernel/Time/TimeManagement.h +++ b/Kernel/Time/TimeManagement.h @@ -81,7 +81,7 @@ private: TimePage& time_page(); void update_time_page(); -#if ARCH(I386) || ARCH(X86_64) +#if ARCH(X86_64) bool probe_and_set_x86_legacy_hardware_timers(); bool probe_and_set_x86_non_legacy_hardware_timers(); void increment_time_since_boot_hpet(); |