From ab687852d388622b852b399d653054380b187d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20W=C4=99c=C5=82awski?= <r.weclawski@gmail.com>
Date: Sun, 17 Dec 2017 17:19:06 +0100
Subject: [PATCH] Convert entry count to u64, remove unnecessary parentheses
---
src/arch/x86_64/paging/entry.rs | 2 +-
src/arch/x86_64/paging/table.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/arch/x86_64/paging/entry.rs b/src/arch/x86_64/paging/entry.rs
index ea657e6e..38ec68e4 100644
--- a/src/arch/x86_64/paging/entry.rs
+++ b/src/arch/x86_64/paging/entry.rs
@@ -67,6 +67,6 @@ impl Entry {
/// Set bits 52-61 in entry, used as counter for page table
pub fn set_counter_bits(&mut self, count: u64) {
- self.0 = ((self.0 & 0xc00fffff_ffffffff) | (count << 52));
+ self.0 = (self.0 & 0xc00fffff_ffffffff) | (count << 52);
}
}
diff --git a/src/arch/x86_64/paging/table.rs b/src/arch/x86_64/paging/table.rs
index 1950719f..4f6e4aca 100644
--- a/src/arch/x86_64/paging/table.rs
+++ b/src/arch/x86_64/paging/table.rs
@@ -61,7 +61,7 @@ impl<L> Table<L> where L: TableLevel {
/// Set number of entries in first table entry
fn set_entry_count(&mut self, count: u64) {
- assert!(count <= ENTRY_COUNT, "count can't be greater than ENTRY_COUNT");
+ assert!(count <= ENTRY_COUNT as u64, "count can't be greater than ENTRY_COUNT");
self.entries[0].set_counter_bits(count);
}
--
GitLab