diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-29 15:09:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-29 15:09:03 +0200 |
commit | e0563e049531973e665db853e825a4efed9f881d (patch) | |
tree | 5cf6fc0b80af1947414bc69125b11110e25494aa /include/linux/blkdev.h | |
parent | perf/x86: Export some PMU attributes in caps/ directory (diff) | |
parent | perf/ftrace: Fix double traces of perf on ftrace:function (diff) | |
download | linux-dev-e0563e049531973e665db853e825a4efed9f881d.tar.xz linux-dev-e0563e049531973e665db853e825a4efed9f881d.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
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, 0 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 25f6a0cb27d3..2a5d52fa90f5 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -568,7 +568,6 @@ struct request_queue { #if defined(CONFIG_BLK_DEV_BSG) bsg_job_fn *bsg_job_fn; - int bsg_job_size; struct bsg_class_device bsg_dev; #endif |