diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /include/linux/kernel_stat.h | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index 2491372a9..c9f194be4 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h @@ -12,18 +12,19 @@ * used by rstatd/perfmeter */ -#define DK_NDRIVE 4 +#define DK_MAX_MAJOR 16 +#define DK_MAX_DISK 16 struct kernel_stat { unsigned int cpu_user, cpu_nice, cpu_system; unsigned int per_cpu_user[NR_CPUS], per_cpu_nice[NR_CPUS], per_cpu_system[NR_CPUS]; - unsigned int dk_drive[DK_NDRIVE]; - unsigned int dk_drive_rio[DK_NDRIVE]; - unsigned int dk_drive_wio[DK_NDRIVE]; - unsigned int dk_drive_rblk[DK_NDRIVE]; - unsigned int dk_drive_wblk[DK_NDRIVE]; + 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; #if !defined(CONFIG_ARCH_S390) |