Subject: [PATCH -next] block: blk-iopoll sysctl iff CONFIG_BLOCK

From: Randy Dunlap <[email-masked]>
Date: Fri, 7 Aug 2009 11:16:59 -0700

From: Randy Dunlap <[email-masked]>

New block-iopoll sysctl should be surrounded by CONFIG_BLOCK to
prevent build error:

kernel/built-in.o:(.data+0x2990): undefined reference to `blk_iopoll_enabled'

Signed-off-by: Randy Dunlap <[email-masked]>
---
 kernel/sysctl.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20090807.orig/kernel/sysctl.c
+++ linux-next-20090807/kernel/sysctl.c
@@ -990,6 +990,7 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 #endif
+#ifdef CONFIG_BLOCK
 	{
 		.ctl_name	= CTL_UNNUMBERED,
 		.procname	= "blk_iopoll",
@@ -998,6 +999,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

---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/