From 03fcb7e5c3805995eb40792e4f7429ccc81a0936 Mon Sep 17 00:00:00 2001 From: Maksym Planeta Date: Wed, 6 Mar 2013 03:28:14 +0100 Subject: 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. --- vm/vm_fault.c | 3 +++ 1 file changed, 3 insertions(+) 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; -- cgit v1.2.3