[PATCH] block: Limit blk_iopoll sysctl to CONFIG_BLOCK=y.

[PATCH] block: Limit blk_iopoll sysctl to CONFIG_BLOCK=y.

[Paul Mundt]

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 <lethal@linux-sh.org>

---

 kernel/sysctl.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6bb59f7..1a631ba 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -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

Re: [PATCH] block: Limit blk_iopoll sysctl to CONFIG_BLOCK=y.

[Jens Axboe]

On Wed, Sep 16 2009, Paul Mundt wrote:
> 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.

Already sent in, but Linus hasn't pulled it yet.


-- 
Jens Axboe