diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-24 11:54:15 +0000 |
| commit | 429421a879dd2d62ac3573ba23d9faac162f5621 (patch) | |
| tree | 9eda98c6222bf72739b7b1a3a63a134296986235 /arch/arm64/include/asm/proc-fns.h | |
| parent | 8df8c7d7220e4ea159ca57edbf7f2c6cbf6a7278 (diff) | |
| parent | 15f82fce54b86e159fe5a1d41dcdc89e12b26459 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-android-15.01
Diffstat (limited to 'arch/arm64/include/asm/proc-fns.h')
| -rw-r--r-- | arch/arm64/include/asm/proc-fns.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/proc-fns.h b/arch/arm64/include/asm/proc-fns.h index 0c657bb54597..0d3b0b17e927 100644 --- a/arch/arm64/include/asm/proc-fns.h +++ b/arch/arm64/include/asm/proc-fns.h @@ -34,6 +34,8 @@ extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm); extern void cpu_reset(unsigned long addr) __attribute__((noreturn)); extern void cpu_do_suspend(struct cpu_suspend_ctx *ptr); extern u64 cpu_do_resume(phys_addr_t ptr, u64 idmap_ttbr); +void cpu_soft_restart(phys_addr_t cpu_reset, + unsigned long addr) __attribute__((noreturn)); #include <asm/memory.h> |