diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-10-02 23:03:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-10-02 23:03:33 -0700 |
| commit | fda0b1edfe0e329374e37efee7e3a03e4c3d49b1 (patch) | |
| tree | 9f841042ab93565e2ebf49dbecb515ccdd7baa0e /include/linux/kernel_stat.h | |
| parent | 81ad17d73401df4a7b924b5cf8dce87a098303f5 (diff) | |
| parent | 5de3d3bdc9db381fdbbf5a22df4dd29864b63071 (diff) | |
Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/andrew
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 75533ee86b73..a687f5b224e9 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -18,19 +18,14 @@ struct kernel_stat { unsigned int per_cpu_user[NR_CPUS], per_cpu_nice[NR_CPUS], - per_cpu_system[NR_CPUS]; + per_cpu_system[NR_CPUS], + per_cpu_idle[NR_CPUS], + per_cpu_iowait[NR_CPUS]; unsigned int dk_drive[DK_MAX_MAJOR][DK_MAX_DISK]; unsigned int dk_drive_rio[DK_MAX_MAJOR][DK_MAX_DISK]; unsigned int dk_drive_wio[DK_MAX_MAJOR][DK_MAX_DISK]; unsigned int dk_drive_rblk[DK_MAX_MAJOR][DK_MAX_DISK]; unsigned int dk_drive_wblk[DK_MAX_MAJOR][DK_MAX_DISK]; - unsigned int pgpgin, pgpgout; - unsigned int pswpin, pswpout; - unsigned int pgalloc, pgfree; - unsigned int pgactivate, pgdeactivate; - unsigned int pgfault, pgmajfault; - unsigned int pgscan, pgsteal; - unsigned int pageoutrun, allocstall; #if !defined(CONFIG_ARCH_S390) unsigned int irqs[NR_CPUS][NR_IRQS]; #endif |