3724 kstat reports idle time as io_wait, kernel as pio_wait, etc

*** 916,928 ****
  
          SAVE_UINT32_X(ksi, "idle", sysinfo->cpu[CPU_IDLE]);
          SAVE_UINT32_X(ksi, "user", sysinfo->cpu[CPU_USER]);
          SAVE_UINT32_X(ksi, "kernel", sysinfo->cpu[CPU_KERNEL]);
          SAVE_UINT32_X(ksi, "wait", sysinfo->cpu[CPU_WAIT]);
!         SAVE_UINT32_X(ksi, "wait_io", sysinfo->cpu[W_IO]);
!         SAVE_UINT32_X(ksi, "wait_swap", sysinfo->cpu[W_SWAP]);
!         SAVE_UINT32_X(ksi, "wait_pio", sysinfo->cpu[W_PIO]);
          SAVE_UINT32(ksi, sysinfo, bread);
          SAVE_UINT32(ksi, sysinfo, bwrite);
          SAVE_UINT32(ksi, sysinfo, lread);
          SAVE_UINT32(ksi, sysinfo, lwrite);
          SAVE_UINT32(ksi, sysinfo, phread);
--- 916,928 ----
  
          SAVE_UINT32_X(ksi, "idle", sysinfo->cpu[CPU_IDLE]);
          SAVE_UINT32_X(ksi, "user", sysinfo->cpu[CPU_USER]);
          SAVE_UINT32_X(ksi, "kernel", sysinfo->cpu[CPU_KERNEL]);
          SAVE_UINT32_X(ksi, "wait", sysinfo->cpu[CPU_WAIT]);
!         SAVE_UINT32_X(ksi, "wait_io", sysinfo->wait[W_IO]);
!         SAVE_UINT32_X(ksi, "wait_swap", sysinfo->wait[W_SWAP]);
!         SAVE_UINT32_X(ksi, "wait_pio", sysinfo->wait[W_PIO]);
          SAVE_UINT32(ksi, sysinfo, bread);
          SAVE_UINT32(ksi, sysinfo, bwrite);
          SAVE_UINT32(ksi, sysinfo, lread);
          SAVE_UINT32(ksi, sysinfo, lwrite);
          SAVE_UINT32(ksi, sysinfo, phread);