diff options
-rw-r--r-- | block/genhd.c | 6 | ||||
-rw-r--r-- | include/linux/genhd.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/block/genhd.c b/block/genhd.c index 64510fd88621..db4c60c802d6 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -454,8 +454,8 @@ static ssize_t disk_stats_read(struct gendisk * disk, char *page) | |||
454 | disk_round_stats(disk); | 454 | disk_round_stats(disk); |
455 | preempt_enable(); | 455 | preempt_enable(); |
456 | return sprintf(page, | 456 | return sprintf(page, |
457 | "%8u %8u %8llu %8u " | 457 | "%8lu %8lu %8llu %8u " |
458 | "%8u %8u %8llu %8u " | 458 | "%8lu %8lu %8llu %8u " |
459 | "%8u %8u %8u" | 459 | "%8u %8u %8u" |
460 | "\n", | 460 | "\n", |
461 | disk_stat_read(disk, ios[READ]), | 461 | disk_stat_read(disk, ios[READ]), |
@@ -649,7 +649,7 @@ static int diskstats_show(struct seq_file *s, void *v) | |||
649 | preempt_disable(); | 649 | preempt_disable(); |
650 | disk_round_stats(gp); | 650 | disk_round_stats(gp); |
651 | preempt_enable(); | 651 | preempt_enable(); |
652 | seq_printf(s, "%4d %4d %s %u %u %llu %u %u %u %llu %u %u %u %u\n", | 652 | seq_printf(s, "%4d %4d %s %lu %lu %llu %u %lu %lu %llu %u %u %u %u\n", |
653 | gp->major, n + gp->first_minor, disk_name(gp, n, buf), | 653 | gp->major, n + gp->first_minor, disk_name(gp, n, buf), |
654 | disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]), | 654 | disk_stat_read(gp, ios[0]), disk_stat_read(gp, merges[0]), |
655 | (unsigned long long)disk_stat_read(gp, sectors[0]), | 655 | (unsigned long long)disk_stat_read(gp, sectors[0]), |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index fd647fde5ec1..179fea53fc81 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -89,12 +89,12 @@ struct hd_struct { | |||
89 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 | 89 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 |
90 | 90 | ||
91 | struct disk_stats { | 91 | struct disk_stats { |
92 | unsigned sectors[2]; /* READs and WRITEs */ | 92 | unsigned long sectors[2]; /* READs and WRITEs */ |
93 | unsigned ios[2]; | 93 | unsigned long ios[2]; |
94 | unsigned merges[2]; | 94 | unsigned long merges[2]; |
95 | unsigned ticks[2]; | 95 | unsigned long ticks[2]; |
96 | unsigned io_ticks; | 96 | unsigned long io_ticks; |
97 | unsigned time_in_queue; | 97 | unsigned long time_in_queue; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct gendisk { | 100 | struct gendisk { |