Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7b352f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3eb51ec cb684b5b

kernel/sysctl.c

+4 −0
Original line number Diff line number Diff line
@@ -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