From 0b69568411ea7284f38c260fb4bb02c0f76a55c8 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 2 Aug 2014 17:58:20 +0000 Subject: [PATCH] Rewrite a loop in vm_map_wire() so that gcc doesn't think that the variable "rv" is uninitialized. Reported by: bz --- sys/vm/vm_map.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 67977ebe175..68ae0d2f482 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2569,8 +2569,8 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_busy(map); vm_map_unlock(map); - for (faddr = saved_start; faddr < saved_end; faddr += - PAGE_SIZE) { + faddr = saved_start; + do { /* * Simulate a fault to get the page and enter * it into the physical map. @@ -2578,7 +2578,7 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end, if ((rv = vm_fault(map, faddr, VM_PROT_NONE, VM_FAULT_CHANGE_WIRING)) != KERN_SUCCESS) break; - } + } while ((faddr += PAGE_SIZE) < saved_end); vm_map_lock(map); vm_map_unbusy(map); if (last_timestamp + 1 != map->timestamp) {