Subject: stop_machine: add stopmachine_timeout sysctl entry Date: Tue, 29 Apr 2008 10:33:55 +0900 From: Hidetoshi Seto There would be some system which cannot accept the arbitrary timeout value(= 5sec). This patch allow us to change the value via sysctl. Signed-off-by: Hidetoshi Seto Signed-off-by: Rusty Russell --- kernel/stop_machine.c | 2 +- kernel/sysctl.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -39,7 +39,7 @@ static atomic_t stopmachine_thread_ack; static atomic_t stopmachine_thread_ack; static atomic_t stopmachine_busy_exit; -static unsigned long stopmachine_timeout = 5; /* secs, arbitrary */ +unsigned long stopmachine_timeout = 5; /* secs, arbitrary */ static int stopmachine(void *cpu) { diff --git a/kernel/sysctl.c b/kernel/sysctl.c --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -81,6 +81,7 @@ extern int maps_protect; extern int maps_protect; extern int sysctl_stat_interval; extern int latencytop_enabled; +extern unsigned long stopmachine_timeout; /* Constants used for minimum and maximum */ #if defined(CONFIG_DETECT_SOFTLOCKUP) || defined(CONFIG_HIGHMEM) @@ -804,6 +805,17 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dostring, .strategy = &sysctl_string, }, +#ifdef CONFIG_STOP_MACHINE + { + .ctl_name = CTL_UNNUMBERED, + .procname = "stopmachine_timeout", + .data = &stopmachine_timeout, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = &proc_doulongvec_minmax, + .strategy = &sysctl_intvec, + }, +#endif #ifdef CONFIG_KEYS { .ctl_name = CTL_UNNUMBERED,