diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 21:14:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 21:14:38 +0100 |
| commit | 5dfcc13902bfb6d252b84e234bfc4cdba76c1069 (patch) | |
| tree | a8387dd295c92d7d7b1087cd285d9836898292ce /include | |
| parent | Merge tag 'media/v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() (diff) | |
| download | linux-5dfcc13902bfb6d252b84e234bfc4cdba76c1069.tar.xz linux-5dfcc13902bfb6d252b84e234bfc4cdba76c1069.zip | |
Merge tag 'block-5.6-2020-03-07' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Here are a few fixes that should go into this release. This contains:
- Revert of a bad bcache patch from this merge window
- Removed unused function (Daniel)
- Fixup for the blktrace fix from Jan from this release (Cengiz)
- Fix of deeper level bfqq overwrite in BFQ (Carlo)"
* tag 'block-5.6-2020-03-07' of git://git.kernel.dk/linux-block:
block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group()
blktrace: fix dereference after null check
Revert "bcache: ignore pending signals when creating gc and allocator thread"
block: Remove used kblockd_schedule_work_on()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 10455b2bbbb4..f629d40c645c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -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) \ |