summaryrefslogtreecommitdiff
path: root/lib/psci
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2016-12-12 14:29:01 +0000
committerGitHub <noreply@github.com>2016-12-12 14:29:01 +0000
commit1b5fa6ef1082ffb9979df4aad91525eda571eb50 (patch)
tree082595c467672752cadc9228f43ef1c78f369e4e /lib/psci
parent919ad05ecb8fab23f91a37783dc5f246847c7bd2 (diff)
parenta806dad58c4cf752238d7bbffbc9a1ce17f63cea (diff)
Merge pull request #774 from jeenu-arm/no-return-macro
Define and use no_ret macro where no return is expected
Diffstat (limited to 'lib/psci')
-rw-r--r--lib/psci/aarch32/psci_helpers.S2
-rw-r--r--lib/psci/aarch64/psci_helpers.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/psci/aarch32/psci_helpers.S b/lib/psci/aarch32/psci_helpers.S
index 36d5d7d9..27d651e3 100644
--- a/lib/psci/aarch32/psci_helpers.S
+++ b/lib/psci/aarch32/psci_helpers.S
@@ -176,5 +176,5 @@ endfunc do_stack_maintenance
func psci_power_down_wfi
dsb sy // ensure write buffer empty
wfi
- bl plat_panic_handler
+ no_ret plat_panic_handler
endfunc psci_power_down_wfi
diff --git a/lib/psci/aarch64/psci_helpers.S b/lib/psci/aarch64/psci_helpers.S
index ff250a06..eaa17c72 100644
--- a/lib/psci/aarch64/psci_helpers.S
+++ b/lib/psci/aarch64/psci_helpers.S
@@ -167,7 +167,7 @@ endfunc psci_do_pwrup_cache_maintenance
func psci_power_down_wfi
dsb sy // ensure write buffer empty
wfi
- bl plat_panic_handler
+ no_ret plat_panic_handler
endfunc psci_power_down_wfi
/* -----------------------------------------------------------------------