diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
| commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
| tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /include/linux/blkdev.h | |
| parent | 1e4078f0bba46ad61b69548abe6a6faf63b89380 (diff) | |
| parent | 3dd40cb320fee7c23b574ab821ce140ccd1281c9 (diff) | |
| download | cachepc-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.gz cachepc-linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip | |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 |