13097 improve VM tunables for modern systems (fix mismerge)

*** 128,138 ****
   * DISKRPM is used to estimate the number of paging i/o operations
   * which one can expect from a single disk controller.
   *
   * XXX - The system doesn't account for multiple swap devices.
   */
! #define DISKRPM         60
  
  /*
   * The maximum value for handspreadpages which is the the distance
   * between the two clock hands in pages. This is only used when the page
   * scanner is first started.
--- 128,138 ----
   * DISKRPM is used to estimate the number of paging i/o operations
   * which one can expect from a single disk controller.
   *
   * XXX - The system doesn't account for multiple swap devices.
   */
! #define DISKRPM         600
  
  /*
   * The maximum value for handspreadpages which is the the distance
   * between the two clock hands in pages. This is only used when the page
   * scanner is first started.