aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/iseries/mf.c2
-rw-r--r--arch/powerpc/platforms/iseries/setup.c30
2 files changed, 4 insertions, 28 deletions
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 97a26137cf40..18054e922bd1 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -599,7 +599,7 @@ void mf_power_off(void)
599 * Global kernel interface to tell the VSP object in the primary 599 * Global kernel interface to tell the VSP object in the primary
600 * partition to reboot this partition. 600 * partition to reboot this partition.
601 */ 601 */
602void mf_reboot(void) 602void mf_reboot(char *cmd)
603{ 603{
604 printk(KERN_INFO "mf.c: Preparing to bounce...\n"); 604 printk(KERN_INFO "mf.c: Preparing to bounce...\n");
605 signal_ce_msg_simple(0x4e, NULL); 605 signal_ce_msg_simple(0x4e, NULL);
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 190891ce9cb4..127af3b0ba82 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -554,30 +554,6 @@ static void iSeries_show_cpuinfo(struct seq_file *m)
554 seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n"); 554 seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n");
555} 555}
556 556
557/*
558 * Document me.
559 */
560static void iSeries_restart(char *cmd)
561{
562 mf_reboot();
563}
564
565/*
566 * Document me.
567 */
568static void iSeries_power_off(void)
569{
570 mf_power_off();
571}
572
573/*
574 * Document me.
575 */
576static void iSeries_halt(void)
577{
578 mf_power_off();
579}
580
581static void __init iSeries_progress(char * st, unsigned short code) 557static void __init iSeries_progress(char * st, unsigned short code)
582{ 558{
583 printk("Progress: [%04x] - %s\n", (unsigned)code, st); 559 printk("Progress: [%04x] - %s\n", (unsigned)code, st);
@@ -716,9 +692,9 @@ struct machdep_calls __initdata iseries_md = {
716 .get_irq = iSeries_get_irq, 692 .get_irq = iSeries_get_irq,
717 .init_early = iSeries_init_early, 693 .init_early = iSeries_init_early,
718 .pcibios_fixup = iSeries_pci_final_fixup, 694 .pcibios_fixup = iSeries_pci_final_fixup,
719 .restart = iSeries_restart, 695 .restart = mf_reboot,
720 .power_off = iSeries_power_off, 696 .power_off = mf_power_off,
721 .halt = iSeries_halt, 697 .halt = mf_power_off,
722 .get_boot_time = iSeries_get_boot_time, 698 .get_boot_time = iSeries_get_boot_time,
723 .set_rtc_time = iSeries_set_rtc_time, 699 .set_rtc_time = iSeries_set_rtc_time,
724 .get_rtc_time = iSeries_get_rtc_time, 700 .get_rtc_time = iSeries_get_rtc_time,