On Thu, Aug 27, 2015 at 12:43:30AM +0200, Mark Kettenis wrote: > miod@ added this back in 2002 (rev 1.36): > > Back out a few more uvm changes, especially wrt swap usage. > This unbreaks m68k m88k sparc and perhaps others, which eventually froze > when hitting swap. > Tested by various people on various platforms. > ok art@ > > I think it is fairly safe to assume it works well enough now. > > ok?
ok visa@ > Index: uvm_map.c > =================================================================== > RCS file: /home/cvs/src/sys/uvm/uvm_map.c,v > retrieving revision 1.194 > diff -u -p -r1.194 uvm_map.c > --- uvm_map.c 21 Aug 2015 16:04:35 -0000 1.194 > +++ uvm_map.c 26 Aug 2015 22:38:55 -0000 > @@ -4160,7 +4160,6 @@ fail: > * => caller must not write-lock map (read OK). > * => we may sleep while cleaning if SYNCIO [with map read-locked] > */ > -int amap_clean_works = 1; /* XXX for now, just in case... */ > > int > uvm_map_clean(struct vm_map *map, vaddr_t start, vaddr_t end, int flags) > @@ -4215,8 +4214,6 @@ uvm_map_clean(struct vm_map *map, vaddr_ > * - we're not deactivating or freeing pages. > */ > if (amap == NULL || (flags & (PGO_DEACTIVATE|PGO_FREE)) == 0) > - goto flush_object; > - if (!amap_clean_works) > goto flush_object; > > cp_start = MAX(entry->start, start); >
