Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap

diff --cc zfs/lib/libzpool/arc.c
index 8b574d85a76384e8371474c90cc01ceee7afa572,73aecb2852d5282d1c1c9551ee0e51ba50a612b4..d59dfe2d9d18089ff4b4624768656eb43c8715d3
--- 1/zfs/lib/libzpool/arc.c
--- 2/zfs/lib/libzpool/arc.c
+++ b/zfs/lib/libzpool/arc.c
@@@ -1881,11 -1915,12 +1915,12 @@@ arc_reclaim_thread(void
                        }
  
                        /* reset the growth delay for every reclaim */
 -                      growtime = lbolt + (arc_grow_retry * hz);
 +                      growtime = lbolt64 + (arc_grow_retry * hz);
  
                        arc_kmem_reap_now(last_reclaim);
+                       arc_warm = B_TRUE;
  
 -              } else if (arc_no_grow && lbolt >= growtime) {
 +              } else if (arc_no_grow && lbolt64 >= growtime) {
                        arc_no_grow = FALSE;
                }