From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 3/7] arm: Support restart through restart handler call chain
Date: Fri, 18 Jul 2014 00:34:12 -0700 [thread overview]
Message-ID: <1405668856-13738-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1405668856-13738-1-git-send-email-linux@roeck-us.net>
The kernel core now supports a restart handler call chain for system
restart functions.
With this change, the arm_pm_restart callback is now optional, so check
if it is set before calling it. Only call the kernel restart handler
if arm_pm_restart is not set.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v5: Renamed restart function to do_kernel_restart
v4: No change.
v3: Use wrapper function to execute notifier call chain.
v2: Only call notifier call chain if arm_pm_restart is not set.
Do not include linux/watchdog.h.
arch/arm/kernel/process.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 81ef686..84ca0d5 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -230,7 +230,10 @@ void machine_restart(char *cmd)
local_irq_disable();
smp_send_stop();
- arm_pm_restart(reboot_mode, cmd);
+ if (arm_pm_restart)
+ arm_pm_restart(reboot_mode, cmd);
+ else
+ do_kernel_restart(cmd);
/* Give a grace period for failure to restart of 1s */
mdelay(1000);
--
1.9.1
next prev parent reply other threads:[~2014-07-18 7:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 7:34 [PATCH v5 0/7] kernel: Add support for restart handler call chain Guenter Roeck
2014-07-18 7:34 ` [PATCH v5 1/7] kernel: Add support for kernel " Guenter Roeck
2014-07-30 20:18 ` Stephen Boyd
2014-07-30 20:53 ` Guenter Roeck
2014-07-18 7:34 ` [PATCH v5 2/7] arm64: Support restart through " Guenter Roeck
2014-07-18 7:34 ` Guenter Roeck [this message]
2014-07-18 7:34 ` [PATCH v5 4/7] power/restart: Call machine_restart instead of arm_pm_restart Guenter Roeck
2014-07-18 7:34 ` [PATCH v5 5/7] watchdog: moxart: Register restart handler with kernel restart handler Guenter Roeck
2014-07-18 7:34 ` [PATCH v5 6/7] watchdog: alim7101: " Guenter Roeck
2014-07-18 7:34 ` [PATCH v5 7/7] arm/arm64: Unexport restart handlers Guenter Roeck
2014-07-21 12:30 ` [PATCH v5 0/7] kernel: Add support for restart handler call chain Catalin Marinas
2014-07-21 12:51 ` Guenter Roeck
2014-07-25 18:53 ` Guenter Roeck
2014-07-30 1:50 ` Guenter Roeck
2014-07-30 12:16 ` Heiko Stübner
2014-07-30 14:10 ` Guenter Roeck
2014-07-30 14:28 ` Guenter Roeck
2014-08-02 19:51 ` [PATCH v5.1 9/7] watchdog: s3c2410: add restart handler Heiko Stübner
2014-08-02 20:09 ` [PATCH v5.1 10/7] clk: samsung: register restart handlers for s3c2412 and s3c2443 Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405668856-13738-4-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).