Code review comments from pmooney (sundry), and igork (screwups in zonecfg refactoring)

@@ -313,12 +313,11 @@
                          * Don't allow ASLR to cause mappings to fail below
                          * because of SF erratum #57
                          */
                         maxslew = MIN(maxslew, (addr - errata57_limit));
 
-                        slew = slew % MIN(MIN(aslr_max_map_skew, (addr - base)),
-                            addr - errata57_limit);
+                        slew = slew % maxslew;
                         addr -= P2ALIGN(slew, align_amount);
                 }
 
                 ASSERT(addr > base);
                 ASSERT(addr + len < base + slen);