diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 14:42:39 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 14:42:39 +0200 |
| commit | 26eafeaab917dd228d292f362be1577c9b4b2e77 (patch) | |
| tree | bd89e0ed1c11635d184c7b497aac6ddd967ebde8 /include/linux/blkdev.h | |
| parent | 4c3711d7fb4763c63b2654f2d07cbe21ca5aadd4 (diff) | |
| parent | d81fa669e3de7eb8a631d7d95dac5fbcb2bf9d4e (diff) | |
| download | linux-26eafeaab917dd228d292f362be1577c9b4b2e77.tar.gz linux-26eafeaab917dd228d292f362be1577c9b4b2e77.tar.bz2 linux-26eafeaab917dd228d292f362be1577c9b4b2e77.zip | |
Merge branch 'linus' into timers/core
Pick up upstream changes to get the prerequisites for the timer changes.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 460294bb0fa5..02fa42d24b52 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -551,6 +551,7 @@ struct request_queue { int node; #ifdef CONFIG_BLK_DEV_IO_TRACE struct blk_trace *blk_trace; + struct mutex blk_trace_mutex; #endif /* * for flush operations |