Merge branch 'master' into fix_warnings

2017-06-26 14:22:17 +02:00
parent 586f249069 0478e5f7fb
commit 2dcd563709
33 changed files with 3396 additions and 225 deletions
@@ -27,7 +27,6 @@ impl<T: FrameAllocator> RecycleAllocator<T> {
        for free in self.free.iter() {
            count += free.1;
        }
-        println!("Free count: {} in {} entries", count, self.free.len());
        count
    }

@@ -93,7 +92,7 @@ impl<T: FrameAllocator> FrameAllocator for RecycleAllocator<T> {
        if let Some(i) = small_i {
            let (address, remove) = {
                let free = &mut self.free[i];
-                free.1 -= 1;
+                free.1 -= count;
                (free.0 + free.1 * 4096, free.1 == 0)
            };