diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
| commit | ab3b3fd38125be0242c2f94bf144b48054210882 (patch) | |
| tree | c668c4d6381046f59a973284ff4de59436f84944 /block/blktrace.c | |
| parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
| download | kernel_samsung_tuna-ab3b3fd38125be0242c2f94bf144b48054210882.zip kernel_samsung_tuna-ab3b3fd38125be0242c2f94bf144b48054210882.tar.gz kernel_samsung_tuna-ab3b3fd38125be0242c2f94bf144b48054210882.tar.bz2 | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'block/blktrace.c')
| -rw-r--r-- | block/blktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index b8c0702..265f7a8 100644 --- a/block/blktrace.c +++ b/block/blktrace.c @@ -80,7 +80,7 @@ static u32 bio_act[5] __read_mostly = { 0, BLK_TC_ACT(BLK_TC_BARRIER), BLK_TC_AC #define trace_sync_bit(rw) \ (((rw) & (1 << BIO_RW_SYNC)) >> (BIO_RW_SYNC - 1)) #define trace_ahead_bit(rw) \ - (((rw) & (1 << BIO_RW_AHEAD)) << (BIO_RW_AHEAD - 0)) + (((rw) & (1 << BIO_RW_AHEAD)) << (2 - BIO_RW_AHEAD)) /* * The worker for the various blk_add_trace*() types. Fills out a |