diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-03 16:35:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-03 16:35:00 -0700 |
| commit | 8a7deb362b764cd557380a3c753f0118304eaa77 (patch) | |
| tree | 51ec46fbed67535efeef0041a50191a215387a7d /include/trace | |
| parent | 08602d74bad6cd6de6866ca6e1adf30c45139931 (diff) | |
| parent | fec558b5f178d9eb35d2ed76f15489c60e3590bd (diff) | |
| download | linux-8a7deb362b764cd557380a3c753f0118304eaa77.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"Sending this off now, as I'm not aware of other current bugs, nor do I
expect further fixes before 4.1 final. This contains two fixes:
- a fix for a bdi unregister warning that gets spewed on md, due to a
regression introduced earlier in this cycle. From Neil Brown.
- a fix for a compile warning for NVMe on 32-bit platforms, also a
regression introduced in this cycle. From Arnd Bergmann"
* 'for-linus' of git://git.kernel.dk/linux-block:
NVMe: fix type warning on 32-bit
block: discard bdi_unregister() in favour of bdi_destroy()
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/writeback.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 880dd7437172..c178d13d6f4c 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -250,7 +250,6 @@ DEFINE_EVENT(writeback_class, name, \ DEFINE_WRITEBACK_EVENT(writeback_nowork); DEFINE_WRITEBACK_EVENT(writeback_wake_background); DEFINE_WRITEBACK_EVENT(writeback_bdi_register); -DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister); DECLARE_EVENT_CLASS(wbc_class, TP_PROTO(struct writeback_control *wbc, struct backing_dev_info *bdi), |