diff options
| author | Ingo Molnar <[email protected]> | 2012-09-19 17:01:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-09-19 17:01:25 +0200 |
| commit | f1f652447694f92beff8a534d94b36ea441c939a (patch) | |
| tree | 177f029e418d517e39dfa2495a9a67a45381b833 /include/linux/backing-dev.h | |
| parent | 55babd8f41f122f5f4c7cebf520c766c983282c6 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into x86/mce
Merge Linux v3.6-rc6, to refresh this tree.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'include/linux/backing-dev.h')
| -rw-r--r-- | include/linux/backing-dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index c97c6b9cd38e..2a9a9abc9126 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h @@ -124,7 +124,6 @@ void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages, void bdi_start_background_writeback(struct backing_dev_info *bdi); int bdi_writeback_thread(void *data); int bdi_has_dirty_io(struct backing_dev_info *bdi); -void bdi_arm_supers_timer(void); void bdi_wakeup_thread_delayed(struct backing_dev_info *bdi); void bdi_lock_two(struct bdi_writeback *wb1, struct bdi_writeback *wb2); |