diff options
Diffstat (limited to 'arch/ppc64/kernel/setup.c')
-rw-r--r-- | arch/ppc64/kernel/setup.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 0a47a5ef428d..d5e4866e9ac2 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -677,11 +677,16 @@ void __init setup_system(void) | |||
677 | DBG(" <- setup_system()\n"); | 677 | DBG(" <- setup_system()\n"); |
678 | } | 678 | } |
679 | 679 | ||
680 | 680 | /* also used by kexec */ | |
681 | void machine_restart(char *cmd) | 681 | void machine_shutdown(void) |
682 | { | 682 | { |
683 | if (ppc_md.nvram_sync) | 683 | if (ppc_md.nvram_sync) |
684 | ppc_md.nvram_sync(); | 684 | ppc_md.nvram_sync(); |
685 | } | ||
686 | |||
687 | void machine_restart(char *cmd) | ||
688 | { | ||
689 | machine_shutdown(); | ||
685 | ppc_md.restart(cmd); | 690 | ppc_md.restart(cmd); |
686 | #ifdef CONFIG_SMP | 691 | #ifdef CONFIG_SMP |
687 | smp_send_stop(); | 692 | smp_send_stop(); |
@@ -690,13 +695,11 @@ void machine_restart(char *cmd) | |||
690 | local_irq_disable(); | 695 | local_irq_disable(); |
691 | while (1) ; | 696 | while (1) ; |
692 | } | 697 | } |
693 | |||
694 | EXPORT_SYMBOL(machine_restart); | 698 | EXPORT_SYMBOL(machine_restart); |
695 | 699 | ||
696 | void machine_power_off(void) | 700 | void machine_power_off(void) |
697 | { | 701 | { |
698 | if (ppc_md.nvram_sync) | 702 | machine_shutdown(); |
699 | ppc_md.nvram_sync(); | ||
700 | ppc_md.power_off(); | 703 | ppc_md.power_off(); |
701 | #ifdef CONFIG_SMP | 704 | #ifdef CONFIG_SMP |
702 | smp_send_stop(); | 705 | smp_send_stop(); |
@@ -705,13 +708,11 @@ void machine_power_off(void) | |||
705 | local_irq_disable(); | 708 | local_irq_disable(); |
706 | while (1) ; | 709 | while (1) ; |
707 | } | 710 | } |
708 | |||
709 | EXPORT_SYMBOL(machine_power_off); | 711 | EXPORT_SYMBOL(machine_power_off); |
710 | 712 | ||
711 | void machine_halt(void) | 713 | void machine_halt(void) |
712 | { | 714 | { |
713 | if (ppc_md.nvram_sync) | 715 | machine_shutdown(); |
714 | ppc_md.nvram_sync(); | ||
715 | ppc_md.halt(); | 716 | ppc_md.halt(); |
716 | #ifdef CONFIG_SMP | 717 | #ifdef CONFIG_SMP |
717 | smp_send_stop(); | 718 | smp_send_stop(); |
@@ -720,7 +721,6 @@ void machine_halt(void) | |||
720 | local_irq_disable(); | 721 | local_irq_disable(); |
721 | while (1) ; | 722 | while (1) ; |
722 | } | 723 | } |
723 | |||
724 | EXPORT_SYMBOL(machine_halt); | 724 | EXPORT_SYMBOL(machine_halt); |
725 | 725 | ||
726 | static int ppc64_panic_event(struct notifier_block *this, | 726 | static int ppc64_panic_event(struct notifier_block *this, |