diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2020-03-28 00:36:17 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2020-03-28 00:36:17 +0300 |
| commit | 06dd3f31cb70035cbd3f507c11fd50e3089aeb81 (patch) | |
| tree | 98065919df104fba32191f2464f4193a998cd6a1 /include/linux/blkdev.h | |
| parent | 82f04bfe2aff428b063eefd234679b2d693228ed (diff) | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| download | linux-06dd3f31cb70035cbd3f507c11fd50e3089aeb81.tar.xz | |
Merge tag 'v5.6-rc7' into devel
Linux 5.6-rc7
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 053ea4b51988..f629d40c645c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -524,7 +524,7 @@ struct request_queue { unsigned int sg_reserved_size; int node; #ifdef CONFIG_BLK_DEV_IO_TRACE - struct blk_trace *blk_trace; + struct blk_trace __rcu *blk_trace; struct mutex blk_trace_mutex; #endif /* @@ -1494,7 +1494,6 @@ static inline void put_dev_sector(Sector p) } int kblockd_schedule_work(struct work_struct *work); -int kblockd_schedule_work_on(int cpu, struct work_struct *work); int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay); #define MODULE_ALIAS_BLOCKDEV(major,minor) \ |