diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 21:37:48 +0300 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 17:49:25 +0300 |
| commit | 6b85677c38510e09d482a9bd57000a099003a898 (patch) | |
| tree | 022b75e5d9e3ab070e89cd475d1bc9f8d74f67c1 /arch/arm/mm | |
| parent | 467f97b72b275ca24a390c2aec383c5f3d91b97a (diff) | |
| download | linux-6b85677c38510e09d482a9bd57000a099003a898.tar.xz | |
ARM: Update cpu_v7_reset documentation
cpu_v7_reset() now takes a second parameter indicating whether
we should reboot in HYP or not. Update the documentation to
reflect this.
Tested-by: Keerthy <j-keerthy@ti.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 1846ca4255d0..01d64c0b2563 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -39,13 +39,14 @@ ENTRY(cpu_v7_proc_fin) ENDPROC(cpu_v7_proc_fin) /* - * cpu_v7_reset(loc) + * cpu_v7_reset(loc, hyp) * * Perform a soft reset of the system. Put the CPU into the * same state as it would be if it had been reset, and branch * to what would be the reset vector. * * - loc - location to jump to for soft reset + * - hyp - indicate if restart occurs in HYP mode * * This code must be executed using a flat identity mapping with * caches disabled. |