public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] panic: setup panic_timeout early
@ 2013-11-11 14:40 Felipe Contreras
  2013-11-13  0:03 ` Ingo Molnar
  0 siblings, 1 reply; 16+ messages in thread
From: Felipe Contreras @ 2013-11-11 14:40 UTC (permalink / raw)
  To: linux-kernel; +Cc: Ingo Molnar, Linus Torvalds, Andrew Morton, Felipe Contreras

Otherwise we might not reboot when the user needs it the most (early
on).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

This time using kstrtol() instead of get_option().

Interdiff:

diff --git a/kernel/panic.c b/kernel/panic.c
index 46e37ff..d865263 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -470,12 +470,14 @@ EXPORT_SYMBOL(__stack_chk_fail);
 
 core_param(pause_on_oops, pause_on_oops, int, 0644);
 
-static int __init set_panic_timeout(char *str)
+static int __init set_panic_timeout(char *val)
 {
-	int timeout;
+	long timeout;
+	int ret;
 
-	if (!get_option(&str, &timeout))
-		return -EINVAL;
+	ret = kstrtol(val, 0, &timeout);
+	if (ret < 0)
+		return ret;
 
 	panic_timeout = timeout;
 	return 0;

 kernel/panic.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/kernel/panic.c b/kernel/panic.c
index b6c482c..d865263 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -468,9 +468,23 @@ EXPORT_SYMBOL(__stack_chk_fail);
 
 #endif
 
-core_param(panic, panic_timeout, int, 0644);
 core_param(pause_on_oops, pause_on_oops, int, 0644);
 
+static int __init set_panic_timeout(char *val)
+{
+	long timeout;
+	int ret;
+
+	ret = kstrtol(val, 0, &timeout);
+	if (ret < 0)
+		return ret;
+
+	panic_timeout = timeout;
+	return 0;
+}
+
+early_param("panic_timeout", set_panic_timeout);
+
 static int __init oops_setup(char *s)
 {
 	if (!s)
-- 
1.8.4.2+fc1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2013-11-16 20:24 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-11 14:40 [PATCH v2] panic: setup panic_timeout early Felipe Contreras
2013-11-13  0:03 ` Ingo Molnar
2013-11-14 11:16   ` Felipe Contreras
2013-11-14 17:42     ` Levente Kurusa
     [not found]       ` <52853fe6b0fd9_bf6d31e7c1a@nysa.notmuch>
2013-11-14 22:32         ` Felipe Contreras
2013-11-15 13:12           ` Levente Kurusa
2013-11-15 19:33             ` Felipe Contreras
2013-11-15 19:55               ` Linus Torvalds
2013-11-15 20:10                 ` Felipe Contreras
2013-11-15 20:15                   ` Linus Torvalds
2013-11-15 20:45                     ` Felipe Contreras
2013-11-16 17:45                       ` Ingo Molnar
2013-11-16 18:46                         ` Felipe Contreras
2013-11-16 20:15                           ` Levente Kurusa
2013-11-16 20:24                           ` Levente Kurusa
2013-11-15 11:27     ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox