diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /include/linux/blkdev.h | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7035cec583b6..044467ef7b11 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -690,6 +690,8 @@ struct rq_map_data { | |||
| 690 | struct page **pages; | 690 | struct page **pages; |
| 691 | int page_order; | 691 | int page_order; |
| 692 | int nr_entries; | 692 | int nr_entries; |
| 693 | unsigned long offset; | ||
| 694 | int null_mapped; | ||
| 693 | }; | 695 | }; |
| 694 | 696 | ||
| 695 | struct req_iterator { | 697 | struct req_iterator { |