mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v3] panic: setup panic_timeout early
@ 2013-11-15 19:37 Felipe Contreras
  0 siblings, 0 replies; only message in thread
From: Felipe Contreras @ 2013-11-15 19:37 UTC (permalink / raw)
  To: linux-kernel
  Cc: Ingo Molnar, Linus Torvalds, Andrew Morton, Levente Kurusa,
	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>
---

Since v2:

There's no need for a temporary variable because kstrtoint() is already taking
care of that (if there's an error panic_timeout is not updated).

diff --git a/kernel/panic.c b/kernel/panic.c
index d865263..fa3c187 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -472,15 +472,7 @@ 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;
+	return kstrtoint(val, 0, &panic_timeout);
 }
 
 early_param("panic_timeout", set_panic_timeout);

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

diff --git a/kernel/panic.c b/kernel/panic.c
index b6c482c..fa3c187 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -468,9 +468,15 @@ 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)
+{
+	return kstrtoint(val, 0, &panic_timeout);
+}
+
+early_param("panic_timeout", set_panic_timeout);
+
 static int __init oops_setup(char *s)
 {
 	if (!s)
-- 
1.8.4.2+fc1


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-11-15 19:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-15 19:37 [PATCH v3] panic: setup panic_timeout early Felipe Contreras

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

all inboxes | Powered by JetHome®