[PATCH] ppc64: do not return from maple halt, power off, restart

[David Gibson]

On Tue, Jun 07, 2005 at 02:43:54PM -0700, Frank Rowand wrote:
> 
> I updated David Gibson's patch to reflect the comments on the list.
> 
> I tested this patch on linux-2.6.12-rc6.
> 
> 
> Benjamin Herrenschmidt wrote:
> <snip>
> >>maple_halt() should do the same thing as maple_power_off().  (It could
> >>even just call maple_power_off().)
> > 
> > 
> > That's debatable... lots of people claim that halt() should just ...
> > halt the kernel and not power off the computer :) I would personally
> > have it do power off, but since that doesn't work ...
> 
> I changed maple_halt() to call maple_power_off(), to be consistent
> with the other ppc64 halt functions.  If someone changed it to
> just halt, it wouldn't bother me.
> 
> >>maple_restart(), maple_power_off(), and maple_halt() should not ever
> >>return.  The returns could be replaced with the code from my patch
> >>that started this thread.
> > 
> > 
> > I think the "return" case should be handled at the toplevel function in
> > setup.c that calls ppc_md.
> 
> Good idea.  I updated setup.c to catch the return case for restart,
> power down, and halt.  I used "#ifdef CONFIG_SMP" instead of adding
> a null smp_send_stop() to include/smp.h.  This #ifdef is already
> used in several other places in setup.c.
> 
> I also changed the printk()s in David's patch from KERN_INFO to
> KERN_EMERG to match the shutdown messages in kernel/sys.c.
> 
> How does this version of the patch look to everyone?

Looks ok to me.

Acked-by: David Gibson <dwg at au1.ibm.com>

> Signed-off-by: Frank Rowand <frowand at mvista.com>
> Signed-off-by: David Gibson <dwg at au1.ibm.com>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/people/dgibson