From 358abbd40f51c3ce703d822c045c64593c3d1210 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 29 Jul 2022 18:53:27 -0600 Subject: [PATCH] Fix copy paste error and update rmm --- rmm | 2 +- src/arch/x86_64/cpuid.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rmm b/rmm index 23d4995..e9950ee 160000 --- a/rmm +++ b/rmm @@ -1 +1 @@ -Subproject commit 23d4995e502e42b8a73970a46716c863ee3f4dc1 +Subproject commit e9950ee6da9e56574b1d534f36600c25505ffb7d diff --git a/src/arch/x86_64/cpuid.rs b/src/arch/x86_64/cpuid.rs index 760a851..cb1eaa4 100644 --- a/src/arch/x86_64/cpuid.rs +++ b/src/arch/x86_64/cpuid.rs @@ -3,7 +3,7 @@ use raw_cpuid::{CpuId, CpuIdResult}; pub fn cpuid() -> Option { //TODO: ensure that CPUID exists! https://wiki.osdev.org/CPUID#Checking_CPUID_availability Some(CpuId::with_cpuid_fn(|a, c| { - let result = unsafe { core::arch::x86::__cpuid_count(a, c) }; + let result = unsafe { core::arch::x86_64::__cpuid_count(a, c) }; CpuIdResult { eax: result.eax, ebx: result.ebx,