diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-04 21:12:36 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-04 21:12:36 -0700 |
| commit | 110291f2d1d589e042d172c1b57777679abefe6d (patch) | |
| tree | f558a06a925fcfc2fbcfcab45c8cde0eb76d9614 /include/linux/genhd.h | |
| parent | f1a6400876c588497a5477cd642ead33fcbc7e81 (diff) | |
| parent | 863003968458edf00e2ebdad49f68040203d886d (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 460ef0362ab5..13e0933ccbc7 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -75,7 +75,6 @@ struct disk_stats { unsigned read_merges, write_merges; unsigned read_ticks, write_ticks; unsigned io_ticks; - int in_flight; unsigned time_in_queue; }; @@ -101,6 +100,7 @@ struct gendisk { unsigned sync_io; /* RAID */ unsigned long stamp, stamp_idle; + int in_flight; #ifdef CONFIG_SMP struct disk_stats *dkstats; #else |