diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 03:19:50 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 03:19:50 (GMT) |
| commit | 86adf8adfcb3d3f4b6c30aeb40da480da02de1d1 (patch) | |
| tree | 87800568dc48006f3418689e4d23578f5c1d79b7 /include/linux/blkdev.h | |
| parent | 3fff0179e33cd7d0a688dab65700c46ad089e934 (diff) | |
| parent | cbb5901b904e122139e97c6f4caed9b1f13c3455 (diff) | |
| download | linux-fsl-qoriq-86adf8adfcb3d3f4b6c30aeb40da480da02de1d1.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: add text file detailing queue/ sysfs files
bio.h: If they MUST be inlined, then use __always_inline
Fix misleading comment in bio.h
block: fix inconsistent parenthesisation of QUEUE_FLAG_DEFAULT
block: fix oops in blk_queue_io_stat()
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d08c4b8..dcaa0fd 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -455,7 +455,7 @@ struct request_queue #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_CLUSTER) | \ - 1 << QUEUE_FLAG_STACKABLE) + (1 << QUEUE_FLAG_STACKABLE)) static inline int queue_is_locked(struct request_queue *q) { |