diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-09-01 10:12:15 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-09-01 10:12:15 +0200 |
| commit | a5acee57e6f37a9db8818e863d083ea2d7befea3 (patch) | |
| tree | 295c0c0416a42c2df551a4b34ad594f1721fa3ad /kernel | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
| parent | 8accfab465bb2d3a97983af6e034c5f845308cb9 (diff) | |
Merge branch 'for-2.6.32' into for-next
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 58be76017fd0..0ed9fa6f322e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -92,6 +92,7 @@ extern int sysctl_nr_trim_pages; #ifdef CONFIG_RCU_TORTURE_TEST extern int rcutorture_runnable; #endif /* #ifdef CONFIG_RCU_TORTURE_TEST */ +extern int blk_iopoll_enabled; /* Constants used for minimum and maximum */ #ifdef CONFIG_DETECT_SOFTLOCKUP @@ -990,7 +991,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif - + { + .ctl_name = CTL_UNNUMBERED, + .procname = "blk_iopoll", + .data = &blk_iopoll_enabled, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, /* * NOTE: do not add new entries to this table unless you have read * Documentation/sysctl/ctl_unnumbered.txt |