diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /block/blk-throttle.c | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'block/blk-throttle.c')
| -rw-r--r-- | block/blk-throttle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 5352bdafbcf0..6c98cfeeedf0 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c | |||
| @@ -77,7 +77,7 @@ struct throtl_grp { | |||
| 77 | unsigned long slice_end[2]; | 77 | unsigned long slice_end[2]; |
| 78 | 78 | ||
| 79 | /* Some throttle limits got updated for the group */ | 79 | /* Some throttle limits got updated for the group */ |
| 80 | bool limits_changed; | 80 | int limits_changed; |
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | struct throtl_data | 83 | struct throtl_data |
| @@ -102,7 +102,7 @@ struct throtl_data | |||
| 102 | /* Work for dispatching throttled bios */ | 102 | /* Work for dispatching throttled bios */ |
| 103 | struct delayed_work throtl_work; | 103 | struct delayed_work throtl_work; |
| 104 | 104 | ||
| 105 | bool limits_changed; | 105 | int limits_changed; |
| 106 | }; | 106 | }; |
| 107 | 107 | ||
| 108 | enum tg_state_flags { | 108 | enum tg_state_flags { |