aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/genhd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:46:49 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-27 08:46:49 -0800
commit4fa639123d9e6e8dfaa3d116368f4b2478da31af (patch)
tree50c42e2102a542891a15b5011e48fbde14149baf /include/linux/genhd.h
parentdf5b89b323b922f56650b4b4d7c41899b937cf19 (diff)
parentae36b883d29e53b6083ed3d1d44f254cee7507d3 (diff)
downloadkernel_samsung_crespo-4fa639123d9e6e8dfaa3d116368f4b2478da31af.zip
kernel_samsung_crespo-4fa639123d9e6e8dfaa3d116368f4b2478da31af.tar.gz
kernel_samsung_crespo-4fa639123d9e6e8dfaa3d116368f4b2478da31af.tar.bz2
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Don't make debugfs depend on DEBUG_KERNEL [PATCH] Fix blktrace compile with sysfs not defined [PATCH] unused label in drivers/block/cciss. [BLOCK] increase size of disk stat counters [PATCH] blk_execute_rq_nowait-speedup [PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure [BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion [PATCH] kzalloc() conversion in drivers/block [PATCH] update max_sectors documentation
Diffstat (limited to 'include/linux/genhd.h')
-rw-r--r--include/linux/genhd.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index bd7db86..3c1b029 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -90,12 +90,12 @@ struct hd_struct {
#define GENHD_FL_SUPPRESS_PARTITION_INFO 32
struct disk_stats {
- unsigned sectors[2]; /* READs and WRITEs */
- unsigned ios[2];
- unsigned merges[2];
- unsigned ticks[2];
- unsigned io_ticks;
- unsigned time_in_queue;
+ unsigned long sectors[2]; /* READs and WRITEs */
+ unsigned long ios[2];
+ unsigned long merges[2];
+ unsigned long ticks[2];
+ unsigned long io_ticks;
+ unsigned long time_in_queue;
};
struct gendisk {