By the way, do we really need Yoda programming here? Russell King - ARM Linux <li...@arm.linux.org.uk> wrote:
>On Sat, May 11, 2013 at 06:57:25AM -0500, Robin Holt wrote: >> This patch prepares for the moving the parsing of reboot= to the >generic >> kernel code by making reboot_mode into a more generic form. >> >> Signed-off-by: Robin Holt <h...@sgi.com> >> To: Andrew Morton <a...@linux-foundation.org> >> To: Russell King <li...@arm.linux.org.uk> >> Cc: Russ Anderson <r...@sgi.com> >> Cc: Robin Holt <h...@sgi.com> >> Cc: H. Peter Anvin <h...@zytor.com> >> Cc: Guan Xuetao <g...@mprc.pku.edu.cn> >> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> >> Cc: the arch/x86 maintainers <x...@kernel.org> >> Cc: Arm Mailing List <linux-arm-ker...@lists.infradead.org> > >Almost-but-not-quite-Acked-by: Russell King ><rmk+ker...@arm.linux.org.uk> :) > >> diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c >> index f219703..92b47df 100644 >> --- a/arch/arm/kernel/process.c >> +++ b/arch/arm/kernel/process.c >> @@ -174,14 +174,14 @@ void arch_cpu_idle(void) >> default_idle(); >> } >> >> -static char reboot_mode = 'h'; >> +enum reboot_mode reboot_mode = REBOOT_HARD; >> >> -int __init reboot_setup(char *str) >> +static int __init reboot_setup(char *str) >> { >> - reboot_mode = str[0]; >> + if ('s' == str[0]) >> + reboot_mode = REBOOT_SOFT; > >Remember we talked about the 'gpio' mode as well, so you also need here >+ if ('g' == str[0]) > reboot_mode = REBOOT_GPIO; -- Sent from my mobile phone. Please excuse brevity and lack of formatting. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/