diff --git a/Kernel/Arch/x86_64/ASM_wrapper.h b/Kernel/Arch/x86_64/ASM_wrapper.h index 65fd94c7c93..b73e035c78f 100644 --- a/Kernel/Arch/x86_64/ASM_wrapper.h +++ b/Kernel/Arch/x86_64/ASM_wrapper.h @@ -128,7 +128,7 @@ ALWAYS_INLINE u64 read_tsc() return ((u64)msw << 32) | lsw; } -ALWAYS_INLINE u32 rdrand() +ALWAYS_INLINE u32 read_rdrand() { u32 value; asm volatile( @@ -139,7 +139,7 @@ ALWAYS_INLINE u32 rdrand() return value; } -ALWAYS_INLINE u32 rdseed() +ALWAYS_INLINE u32 read_rdseed() { u32 value; asm volatile( diff --git a/Kernel/Prekernel/init.cpp b/Kernel/Prekernel/init.cpp index b7ad0e96ec3..b892b756473 100644 --- a/Kernel/Prekernel/init.cpp +++ b/Kernel/Prekernel/init.cpp @@ -238,11 +238,11 @@ u64 generate_secure_seed() seed ^= read_tsc(); if (processor_info.ecx() & (1 << 30)) // RDRAND - seed ^= rdrand(); + seed ^= read_rdrand(); CPUID extended_features(0x7); if (extended_features.ebx() & (1 << 18)) // RDSEED - seed ^= rdseed(); + seed ^= read_rdseed(); #else # warning No native randomness source available for this architecture #endif diff --git a/Kernel/Random.cpp b/Kernel/Random.cpp index f98162565e3..a98b9ab0cc5 100644 --- a/Kernel/Random.cpp +++ b/Kernel/Random.cpp @@ -33,13 +33,13 @@ UNMAP_AFTER_INIT KernelRng::KernelRng() dmesgln("KernelRng: Using RDSEED as entropy source"); for (size_t i = 0; i < pool_count * reseed_threshold; ++i) { - add_random_event(Kernel::rdseed(), i % 32); + add_random_event(Kernel::read_rdseed(), i % 32); } } else if (Processor::current().has_feature(CPUFeature::RDRAND)) { dmesgln("KernelRng: Using RDRAND as entropy source"); for (size_t i = 0; i < pool_count * reseed_threshold; ++i) { - add_random_event(Kernel::rdrand(), i % 32); + add_random_event(Kernel::read_rdrand(), i % 32); } } else if (TimeManagement::the().can_query_precise_time()) { // Add HPET as entropy source if we don't have anything better.