vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix allocate_frames

Browse source
This commit is contained in:
Jeremy Soller 2016-09-26 17:13:35 -06:00
parent dad81d3c46
commit d72609898a
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/x86_64/src/memory/area_frame_allocator.rs
View file

@ -44,11 +44,13 @@ impl AreaFrameAllocator {
impl FrameAllocator for AreaFrameAllocator {
fn allocate_frames(&mut self, count: usize) -> Option<Frame> {
if let Some(area) = self.current_area {
if count == 0 {
None
} else if let Some(area) = self.current_area {
// "Clone" the frame to return it if it's free. Frame doesn't
// implement Clone, but we can construct an identical frame.
let start_frame = Frame{ number: self.next_free_frame.number };
let end_frame = Frame { number: self.next_free_frame.number + count };
let end_frame = Frame { number: self.next_free_frame.number + (count - 1) };
// the last frame of the current area
let current_area_last_frame = {