block: Limit blk_iopoll sysctl to CONFIG_BLOCK=y.
PATCH 1/1 block: Limit blk_iopoll sysctl to CONFIG_BLOCK=y.
blk_iopoll_enabled is defined in block/blk-iopoll.c, which is only built in the CONFIG_BLOCK=y case. Make the sysctl depend on this, too.
Fixes up the CONFIG_BLOCK=n build.
Signed-off-by Paul Mundt <[email protected]>
---
kernel/sysctl.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/sysctl.c +4 -0
@@ -91,7 +91,9 @@ extern int sysctl_nr_trim_pages;#ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable;#endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ +#ifdef CONFIG_BLOCK extern int blk_iopoll_enabled; +#endif /* Constants used for minimum and maximum */ #ifdef CONFIG_DETECT_SOFTLOCKUP
@@ -998,6 +1000,7 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, },#endif +#ifdef CONFIG_BLOCK { .ctl_name = CTL_UNNUMBERED, .procname = "blk_iopoll",
@@ -1006,6 +1009,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, +#endif /* * NOTE: do not add new entries to this table unless you have read * Documentation/sysctl/ctl_unnumbered.txt
Quoted 4 lines · Paul Mundt
blk_iopoll_enabledis defined inblock/blk-iopoll.c, which is only built in theCONFIG_BLOCK=ycase. Make the sysctl depend on this, too.Fixes up the
CONFIG_BLOCK=nbuild.
Already sent in, but Linus hasn't pulled it yet.
Signature · 1 line
Jens Axboe