Merge branch 'restart-cleanup' into restart

diff --combined arch/arm/mach-iop32x/include/mach/system.h
index 4865a9bff85ed652d4adfab5b1451a5687c0923b,5987196b89c4adfdbfc912d90acd5fc3a72e8161..b4f83e5973b297df59cd36df8ef2daff62366d9e
--- 1/arch/arm/mach-iop32x/include/mach/system.h
--- 2/arch/arm/mach-iop32x/include/mach/system.h
+++ b/arch/arm/mach-iop32x/include/mach/system.h
@@@ -18,8 -18,6 +18,6 @@@ static inline void arch_idle(void
  
  static inline void arch_reset(char mode, const char *cmd)
  {
-       local_irq_disable();
- 
        if (machine_is_n2100()) {
                gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
                gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
@@@ -30,5 -28,5 +28,5 @@@
        *IOP3XX_PCSR = 0x30;
  
        /* Jump into ROM at address 0 */
 -      cpu_reset(0);
 +      soft_restart(0);
  }