diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:21:31 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 10:21:31 +0800 |
| commit | a48f11ebb784e84f06ddb0e1a181a7379ee8915e (patch) | |
| tree | e9ba399a0f41633c390a8160c4ec564aae2a0584 /arch/arm/mach-rpc/include/mach/system.h | |
| parent | 9362902ae4bfa1ee0a67e715b506e19eb980f835 (diff) | |
| parent | e4ed928467699690d1d67e96961c1f11644174ee (diff) | |
Merge branch 'topic/lt-3.2-imx6-pm' into lt-3.2-imx6
* topic/lt-3.2-imx6-pm:
ARM: 7198/1: arm/imx6: add restart support for imx6q
ARM: reset: implement soft_restart for jumping to a physical address
ARM: restart: only perform setup for restart when soft-restarting
ARM: restart: remove argument to setup_mm_for_reboot()
ARM: restart: move reboot failure handing into machine_restart()
ARM: restart: add restart hook to machine_desc record
ARM: lib: add call_with_stack function for safely changing stack
ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1
ARM: imx6q: add cpu suspend/resume support in IRAM
ARM: imx6q: add compatible name of iomuxc
tty: serial: imx: Allow UART to be a source for wakeup
Diffstat (limited to 'arch/arm/mach-rpc/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-rpc/include/mach/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/include/mach/system.h b/arch/arm/mach-rpc/include/mach/system.h index 45c7b935dc4..a354f4d092c 100644 --- a/arch/arm/mach-rpc/include/mach/system.h +++ b/arch/arm/mach-rpc/include/mach/system.h @@ -23,5 +23,5 @@ static inline void arch_reset(char mode, const char *cmd) /* * Jump into the ROM */ - cpu_reset(0); + soft_restart(0); } |