summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksym Planeta <mcsim.planeta@gmail.com>2013-03-06 03:28:14 +0100
committerMaksym Planeta <mcsim.planeta@gmail.com>2013-03-06 03:28:14 +0100
commit03fcb7e5c3805995eb40792e4f7429ccc81a0936 (patch)
tree75596bdf8b5de0c1001682208d14c3236bda4d6d
parentd850c189d311657bdba9253e91102898e2f6267e (diff)
Fix compiler errors and warning
At this moment gnumach at least compiles. Was unable to test it because it requires another glibc version that is not currently installed.
-rw-r--r--vm/vm_fault.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vm/vm_fault.c b/vm/vm_fault.c
index 5b61cbd1..ce236fc2 100644
--- a/vm/vm_fault.c
+++ b/vm/vm_fault.c
@@ -60,6 +60,7 @@
#define min(a, b) ({typeof (a) t1 = a, t2 = b; t1 < t2 ? t1 : t2;})
+#define min(a, b) ({typeof (a) t1 = a, t2 = b; t1 > t2 ? t1 : t2;})
/*
* State needed by vm_fault_continue.
@@ -296,6 +297,7 @@ vm_mark_inactive(vm_object_t obj, vm_page_t m,
if (!m->busy)
vm_page_deactivate(m);
+ return(VM_FAULT_SUCCESS);
}
static vm_fault_return_t
@@ -970,6 +972,7 @@ vm_fault_return_t vm_fault_page(first_object, first_offset, map_entry,
pagein policy and size. */
vm_calculate_clusters(object, offset, map_entry,
&in_start, &in_end,
+ &out_start, &out_end,
&dont_request_page, param);
param.interruptible = interruptible;