[PATCH -v10 09/11] arm, prepare reboot_mode for moving to generic kernel code.

[Russell King - ARM Linux]

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 <holt at sgi.com>
> To: Andrew Morton <akpm at linux-foundation.org>
> To: Russell King <linux at arm.linux.org.uk>
> Cc: Russ Anderson <rja at sgi.com>
> Cc: Robin Holt <holt at sgi.com>
> Cc: H. Peter Anvin <hpa at zytor.com>
> Cc: Guan Xuetao <gxt at mprc.pku.edu.cn>
> Cc: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
> Cc: the arch/x86 maintainers <x86 at kernel.org>
> Cc: Arm Mailing List <linux-arm-kernel at lists.infradead.org>

Almost-but-not-quite-Acked-by: Russell King <rmk+kernel at 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;