diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:53:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:53:00 -0700 |
| commit | 0ee40c6628434f0535da31deeacc28b61e80d810 (patch) | |
| tree | 2873b9c932a63943fad22617b8385866e45347f5 /include/linux | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15 (diff) | |
| parent | [PATCH] fix try_module_get race in elevator_find (diff) | |
| download | linux-dev-0ee40c6628434f0535da31deeacc28b61e80d810.tar.xz linux-dev-0ee40c6628434f0535da31deeacc28b61e80d810.zip | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include/linux')
| -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 01796c41c951..142e1c1e0689 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -119,7 +119,7 @@ struct gendisk { int policy; atomic_t sync_io; /* RAID */ - unsigned long stamp, stamp_idle; + unsigned long stamp; int in_flight; #ifdef CONFIG_SMP struct disk_stats *dkstats; |