summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-16 07:46:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-16 07:46:34 -0700
commit6b7b352f2102e21f9d8f38e932f01d9c5705c073 (patch)
tree189dc171c0de4754d6dcf96c1c68ce300b80e687 /kernel
parenta3eb51ecfa1d7be689f05c9f12cb0fcf862c516e (diff)
parentcb684b5bcd6a79ae7e2360c6b158c4aa7b0a293a (diff)
downloadop-kernel-dev-6b7b352f2102e21f9d8f38e932f01d9c5705c073.zip
op-kernel-dev-6b7b352f2102e21f9d8f38e932f01d9c5705c073.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: fix linkage problem with blk_iopoll and !CONFIG_BLOCK
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c4
1 files changed, 4 insertions, 0 deletions
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
OpenPOWER on IntegriCloud