MERGE: fix arm reset

arch/arm/mach-goldfish/include/mach/system.h

@@ -23,7 +23,7 @@ static inline void arch_idle(void)
 	cpu_do_idle();
 }
 
-static inline void arch_reset(char mode)
+static inline void arch_reset(char mode, const char *cmd)
 {
 }