diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-03-13 15:31:08 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-15 09:54:41 -0700 |
| commit | 007991628ad48901cca3750bb824ba31b1c9dc4c (patch) | |
| tree | ef95e51ff2a6d9b82ca288567bfffe8d40b5be5b /arch/arm/kernel | |
| parent | d60ba0d981bceb24764b58a6dd72cefb97c06a03 (diff) | |
ARM: kernel: flush console and disable irqs before machine_shutdown
Bug 952455
Change-Id: I7400b519eccb274c1b5251032696e10e16ee1c42
Signed-off-by: Tom Cherry <tcherry@nvidia.com>
Reviewed-on: http://git-master/r/89876
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/process.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index d33f09378458..3a2da7788ccb 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -131,14 +131,6 @@ void arm_machine_flush_console(void) void arm_machine_restart(char mode, const char *cmd) { - /* Flush the console to make sure all the relevant messages make it - * out to the console drivers */ - arm_machine_flush_console(); - - /* Disable interrupts first */ - local_irq_disable(); - local_fiq_disable(); - /* * Tell the mm system that we are going to reboot - * we may need it to insert some 1:1 mappings so that @@ -293,6 +285,14 @@ void machine_power_off(void) void machine_restart(char *cmd) { + /* Flush the console to make sure all the relevant messages make it + * out to the console drivers */ + arm_machine_flush_console(); + + /* Disable interrupts first */ + local_irq_disable(); + local_fiq_disable(); + machine_shutdown(); arm_pm_restart(reboot_mode, cmd); } |