diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-07 07:15:46 -0400 |
| commit | 2fe5de9ce7d57498abc14b375cad2fcf8c3ee6cc (patch) | |
| tree | 9478e8cf470c1d5bdb2d89b57a7e35919ab95e72 /include/linux/backing-dev.h | |
| parent | 08f8aeb55d7727d644dbbbbfb798fe937d47751d (diff) | |
| parent | 2b4cfe64dee0d84506b951d81bf55d9891744d25 (diff) | |
Merge branch 'sched/urgent' into sched/core, to avoid conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/backing-dev.h')
| -rw-r--r-- | include/linux/backing-dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h index 24819001f5c8..e488e9459a93 100644 --- a/include/linux/backing-dev.h +++ b/include/linux/backing-dev.h | |||
| @@ -95,7 +95,7 @@ struct backing_dev_info { | |||
| 95 | unsigned int max_ratio, max_prop_frac; | 95 | unsigned int max_ratio, max_prop_frac; |
| 96 | 96 | ||
| 97 | struct bdi_writeback wb; /* default writeback info for this bdi */ | 97 | struct bdi_writeback wb; /* default writeback info for this bdi */ |
| 98 | spinlock_t wb_lock; /* protects work_list */ | 98 | spinlock_t wb_lock; /* protects work_list & wb.dwork scheduling */ |
| 99 | 99 | ||
| 100 | struct list_head work_list; | 100 | struct list_head work_list; |
| 101 | 101 | ||
