summaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-08 14:15:50 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-08 14:15:50 +0300
commit4e37fd4d5dfd39f547b0b00fa184a440a1e44b96 (patch)
tree1f2a678cce5422703aa376ab3506f430d51f89da /include/linux/blkdev.h
parent7943bfaeb6bbbf595df4bd4087f5b890761c4898 (diff)
parent0759e80b84e34a84e7e46e2b1adb528c83d84a47 (diff)
downloadlinux-4e37fd4d5dfd39f547b0b00fa184a440a1e44b96.tar.xz
Merge branch 'pm-qos' into pm-cpuidle
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h1
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