From 7e71c85c8060ac1afed42c94db246614ae573397 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 14 Nov 2016 10:50:00 -0700 Subject: [PATCH] Use core intrinsics instead of memset --- kernel/context/memory.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/context/memory.rs b/kernel/context/memory.rs index bc7400539..76bb9342d 100644 --- a/kernel/context/memory.rs +++ b/kernel/context/memory.rs @@ -1,8 +1,8 @@ use alloc::arc::{Arc, Weak}; use collections::VecDeque; +use core::intrinsics; use spin::Mutex; -use arch::externs::memset; use arch::memory::Frame; use arch::paging::{ActivePageTable, InactivePageTable, Page, PageIter, PhysicalAddress, VirtualAddress}; use arch::paging::entry::{self, EntryFlags}; @@ -202,7 +202,9 @@ impl Memory { if clear { assert!(flush && self.flags.contains(entry::WRITABLE)); - unsafe { memset(self.start_address().get() as *mut u8, 0, self.size); } + unsafe { + intrinsics::write_bytes(self.start_address().get() as *mut u8, 0, self.size); + } } } @@ -300,7 +302,9 @@ impl Memory { if clear { assert!(flush); - unsafe { memset((self.start.get() + self.size) as *mut u8, 0, new_size - self.size); } + unsafe { + intrinsics::write_bytes((self.start.get() + self.size) as *mut u8, 0, new_size - self.size); + } } } else if new_size < self.size { let mut flush_all = false;