aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sched.h4
-rw-r--r--kernel/softlockup.c10
-rw-r--r--kernel/sysctl.c16
3 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index dfc76e172f3f..53534f90a96a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -269,10 +269,10 @@ extern void softlockup_tick(void);
269extern void spawn_softlockup_task(void); 269extern void spawn_softlockup_task(void);
270extern void touch_softlockup_watchdog(void); 270extern void touch_softlockup_watchdog(void);
271extern void touch_all_softlockup_watchdogs(void); 271extern void touch_all_softlockup_watchdogs(void);
272extern int softlockup_thresh; 272extern unsigned long softlockup_thresh;
273extern unsigned long sysctl_hung_task_check_count; 273extern unsigned long sysctl_hung_task_check_count;
274extern unsigned long sysctl_hung_task_timeout_secs; 274extern unsigned long sysctl_hung_task_timeout_secs;
275extern long sysctl_hung_task_warnings; 275extern unsigned long sysctl_hung_task_warnings;
276#else 276#else
277static inline void softlockup_tick(void) 277static inline void softlockup_tick(void)
278{ 278{
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 02f0ad534441..c1d76552446e 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -24,8 +24,8 @@ static DEFINE_PER_CPU(unsigned long, touch_timestamp);
24static DEFINE_PER_CPU(unsigned long, print_timestamp); 24static DEFINE_PER_CPU(unsigned long, print_timestamp);
25static DEFINE_PER_CPU(struct task_struct *, watchdog_task); 25static DEFINE_PER_CPU(struct task_struct *, watchdog_task);
26 26
27static int did_panic; 27static int __read_mostly did_panic;
28int softlockup_thresh = 60; 28unsigned long __read_mostly softlockup_thresh = 60;
29 29
30static int 30static int
31softlock_panic(struct notifier_block *this, unsigned long event, void *ptr) 31softlock_panic(struct notifier_block *this, unsigned long event, void *ptr)
@@ -121,14 +121,14 @@ void softlockup_tick(void)
121/* 121/*
122 * Have a reasonable limit on the number of tasks checked: 122 * Have a reasonable limit on the number of tasks checked:
123 */ 123 */
124unsigned long sysctl_hung_task_check_count = 1024; 124unsigned long __read_mostly sysctl_hung_task_check_count = 1024;
125 125
126/* 126/*
127 * Zero means infinite timeout - no checking done: 127 * Zero means infinite timeout - no checking done:
128 */ 128 */
129unsigned long sysctl_hung_task_timeout_secs = 120; 129unsigned long __read_mostly sysctl_hung_task_timeout_secs = 120;
130 130
131long sysctl_hung_task_warnings = 10; 131unsigned long __read_mostly sysctl_hung_task_warnings = 10;
132 132
133/* 133/*
134 * Only do the hung-tasks check on one CPU: 134 * Only do the hung-tasks check on one CPU:
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 5418ef61e16e..8e96558cb8f3 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -772,9 +772,9 @@ static struct ctl_table kern_table[] = {
772 .ctl_name = CTL_UNNUMBERED, 772 .ctl_name = CTL_UNNUMBERED,
773 .procname = "softlockup_thresh", 773 .procname = "softlockup_thresh",
774 .data = &softlockup_thresh, 774 .data = &softlockup_thresh,
775 .maxlen = sizeof(int), 775 .maxlen = sizeof(unsigned long),
776 .mode = 0644, 776 .mode = 0644,
777 .proc_handler = &proc_dointvec_minmax, 777 .proc_handler = &proc_doulongvec_minmax,
778 .strategy = &sysctl_intvec, 778 .strategy = &sysctl_intvec,
779 .extra1 = &one, 779 .extra1 = &one,
780 .extra2 = &sixty, 780 .extra2 = &sixty,
@@ -783,27 +783,27 @@ static struct ctl_table kern_table[] = {
783 .ctl_name = CTL_UNNUMBERED, 783 .ctl_name = CTL_UNNUMBERED,
784 .procname = "hung_task_check_count", 784 .procname = "hung_task_check_count",
785 .data = &sysctl_hung_task_check_count, 785 .data = &sysctl_hung_task_check_count,
786 .maxlen = sizeof(int), 786 .maxlen = sizeof(unsigned long),
787 .mode = 0644, 787 .mode = 0644,
788 .proc_handler = &proc_dointvec_minmax, 788 .proc_handler = &proc_doulongvec_minmax,
789 .strategy = &sysctl_intvec, 789 .strategy = &sysctl_intvec,
790 }, 790 },
791 { 791 {
792 .ctl_name = CTL_UNNUMBERED, 792 .ctl_name = CTL_UNNUMBERED,
793 .procname = "hung_task_timeout_secs", 793 .procname = "hung_task_timeout_secs",
794 .data = &sysctl_hung_task_timeout_secs, 794 .data = &sysctl_hung_task_timeout_secs,
795 .maxlen = sizeof(int), 795 .maxlen = sizeof(unsigned long),
796 .mode = 0644, 796 .mode = 0644,
797 .proc_handler = &proc_dointvec_minmax, 797 .proc_handler = &proc_doulongvec_minmax,
798 .strategy = &sysctl_intvec, 798 .strategy = &sysctl_intvec,
799 }, 799 },
800 { 800 {
801 .ctl_name = CTL_UNNUMBERED, 801 .ctl_name = CTL_UNNUMBERED,
802 .procname = "hung_task_warnings", 802 .procname = "hung_task_warnings",
803 .data = &sysctl_hung_task_warnings, 803 .data = &sysctl_hung_task_warnings,
804 .maxlen = sizeof(int), 804 .maxlen = sizeof(unsigned long),
805 .mode = 0644, 805 .mode = 0644,
806 .proc_handler = &proc_dointvec_minmax, 806 .proc_handler = &proc_doulongvec_minmax,
807 .strategy = &sysctl_intvec, 807 .strategy = &sysctl_intvec,
808 }, 808 },
809#endif 809#endif