On Thu, 6 Jun 2013 06:47:23 -0500 Robin Holt <h...@sgi.com> wrote:
> Preparing to move the parsing of reboot= to generic kernel code
> forces the change in reboot_mode handling to use the enum.
>
> ...
>
> 125 files changed, 282 insertions(+), 166 deletions(-)
That's a big patch. The potential for ARM breakage is high. I spotted
one glitch:
From: Andrew Morton <a...@linux-foundation.org>
Subject: arm-change-reboot_mode-to-use-enum-reboot_mode-fix
fix arch/arm/mach-socfpga/socfpga.c
Cc: Guan Xuetao <g...@mprc.pku.edu.cn>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: Robin Holt <h...@sgi.com>
Cc: Russ Anderson <r...@sgi.com>
Cc: Russell King <rmk+ker...@arm.linux.org.uk>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---
arch/arm/mach-socfpga/socfpga.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN
arch/arm/mach-socfpga/socfpga.c~arm-change-reboot_mode-to-use-enum-reboot_mode-fix
arch/arm/mach-socfpga/socfpga.c
---
a/arch/arm/mach-socfpga/socfpga.c~arm-change-reboot_mode-to-use-enum-reboot_mode-fix
+++ a/arch/arm/mach-socfpga/socfpga.c
@@ -97,7 +97,7 @@ static void socfpga_cyclone5_restart(enu
temp = readl(rst_manager_base_addr + SOCFPGA_RSTMGR_CTRL);
- if (mode == 'h')
+ if (mode == REBOOT_HARD)
temp |= RSTMGR_CTRL_SWCOLDRSTREQ;
else
temp |= RSTMGR_CTRL_SWWARMRSTREQ;
_
--
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/
