linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 3/7] arm: Support restart through restart notifier call chain
Date: Sun, 13 Jul 2014 08:30:27 -0700	[thread overview]
Message-ID: <1405265431-4561-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1405265431-4561-1-git-send-email-linux@roeck-us.net>

The kernel core now supports a notifier 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 notifier
functions if arm_pm_restart is not set.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
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..5d191e3 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
+		kernel_restart_notify(cmd);
 
 	/* Give a grace period for failure to restart of 1s */
 	mdelay(1000);
-- 
1.9.1

  parent reply	other threads:[~2014-07-13 15:30 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-13 15:30 [PATCH v4 0/7] kernel: Add support for restart notifier call chain Guenter Roeck
2014-07-13 15:30 ` [PATCH v4 1/7] " Guenter Roeck
2014-07-14 14:53   ` Catalin Marinas
2014-07-14 14:58     ` Guenter Roeck
2014-07-15 16:12       ` Guenter Roeck
2014-07-13 15:30 ` [PATCH v4 2/7] arm64: Support restart through " Guenter Roeck
2014-07-14 14:55   ` Catalin Marinas
2014-07-14 15:01     ` Guenter Roeck
2014-07-14 15:07       ` Catalin Marinas
2014-07-13 15:30 ` Guenter Roeck [this message]
2014-07-13 15:30 ` [PATCH v4 4/7] power/restart: Call machine_restart instead of arm_pm_restart Guenter Roeck
2014-07-13 15:30 ` [PATCH v4 5/7] watchdog: moxart: Register restart handler with restart notifier Guenter Roeck
2014-07-14 14:19   ` Catalin Marinas
2014-07-14 14:41     ` Guenter Roeck
2014-07-14 15:11       ` Catalin Marinas
2014-07-13 15:30 ` [PATCH v4 6/7] watchdog: alim7101: " Guenter Roeck
2014-07-13 15:30 ` [PATCH v4 7/7] arm/arm64: Unexport restart handlers Guenter Roeck
2014-07-14 14:22   ` Catalin Marinas
2014-07-14 14:39     ` Guenter Roeck
2014-07-14 15:09       ` Catalin Marinas
2014-07-14 16:26         ` Guenter Roeck

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=1405265431-4561-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).