use the new x86 crate to solve issue hermit-os#30

simonschoening · Apr 30, 2020 · b53ff20 · b53ff20
1 parent 49c9dcd
commit b53ff20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/arch/x86_64/kernel/processor.rs b/src/arch/x86_64/kernel/processor.rs
@@ -276,11 +276,12 @@ impl CpuFrequency {
 		match cpuid.get_tsc_info() {
 			Some(tsc_info) => {
 				// check if tsc_info provides a correct value
-				if tsc_info.denominator() != 0 {
-					let mhz = (tsc_info.tsc_frequency() / 1000000u64) as u16;
-					self.set_detected_cpu_frequency(mhz, CpuFrequencySources::CpuIdTscInfo)
-				} else {
-					Err(())
+				match tsc_info.tsc_frequency() {
+					Some(freq) => {
+						let mhz = (freq / 1000000u64) as u16;
+						self.set_detected_cpu_frequency(mhz, CpuFrequencySources::CpuIdTscInfo)
+					}
+					None => Err(())
 				}
 			}
 			None => Err(()),