Skip to content

Commit

Permalink
[POWERPC] Make function of pm_power_off consistent with x86
Browse files Browse the repository at this point in the history
Allow the pm_power_off function variable in PPC to work as an override.
This makes the function consistent with the other architectures and it
allows generic poweroff operations (like those provided in IPMI
systems) to work properly on PPC.

Signed-off-by: Corey Minyard <minyard@acm.org>
Cc: Joseph Barnett <jbarnett@motorola.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Corey Minyard authored and Paul Mackerras committed Sep 13, 2006
1 parent c3412dc commit 477bcae
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions arch/ppc/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,8 @@ void machine_restart(char *cmd)
ppc_md.restart(cmd);
}

void machine_power_off(void)
static void ppc_generic_power_off(void)
{
#ifdef CONFIG_NVRAM
nvram_sync();
#endif
ppc_md.power_off();
}

Expand All @@ -143,7 +140,17 @@ void machine_halt(void)
ppc_md.halt();
}

void (*pm_power_off)(void) = machine_power_off;
void (*pm_power_off)(void) = ppc_generic_power_off;

void machine_power_off(void)
{
#ifdef CONFIG_NVRAM
nvram_sync();
#endif
if (pm_power_off)
pm_power_off();
ppc_generic_power_off();
}

#ifdef CONFIG_TAU
extern u32 cpu_temp(unsigned long cpu);
Expand Down

0 comments on commit 477bcae

Please sign in to comment.