[PATCH v3] panic: setup panic_timeout early
From: Felipe Contreras
Date: Fri Nov 15 2013 - 14:44:32 EST
Otherwise we might not reboot when the user needs it the most (early
on).
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/