From: Simon Gerber <simon.gerber@inf.ethz.ch>
Date: Thu, 7 May 2015 13:41:39 +0000 (+0200)
Subject: libbarrelfish: vspace_mmu_aware: fix frame_alloc() retry condition.
X-Git-Tag: release2015-05-22~11
X-Git-Url: http://git.barrelfish.org/?p=barrelfish;a=commitdiff_plain;h=69ec26217a13a86945f3853b14478c5e94f379c7

libbarrelfish: vspace_mmu_aware: fix frame_alloc() retry condition.

Fix retry condition when connection to memory server not established yet.

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>
---

diff --git a/lib/barrelfish/vspace/mmu_aware.c b/lib/barrelfish/vspace/mmu_aware.c
index 564b754..273d529 100644
--- a/lib/barrelfish/vspace/mmu_aware.c
+++ b/lib/barrelfish/vspace/mmu_aware.c
@@ -128,7 +128,7 @@ allocate:
         if (err_is_fail(err)) {
             if (err_no(err) == LIB_ERR_RAM_ALLOC_MS_CONSTRAINTS) {
                 // we can only get 4k frames for now; retry with 4k
-                if (alloc_size > BASE_PAGE_SIZE && origsize < BASE_PAGE_SIZE) {
+                if (alloc_size > BASE_PAGE_SIZE && req_size <= BASE_PAGE_SIZE) {
                     alloc_size = BASE_PAGE_SIZE;
                     goto allocate;
                 }