summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/aarch32/debug.S2
-rw-r--r--common/aarch64/debug.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/common/aarch32/debug.S b/common/aarch32/debug.S
index 2e60bd52..583ee4a5 100644
--- a/common/aarch32/debug.S
+++ b/common/aarch32/debug.S
@@ -51,7 +51,7 @@ func do_panic
1:
mov lr, r6
- no_ret plat_panic_handler
+ b plat_panic_handler
endfunc do_panic
/***********************************************************
diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S
index fe6a9a2d..d794d12e 100644
--- a/common/aarch64/debug.S
+++ b/common/aarch64/debug.S
@@ -175,6 +175,6 @@ el3_panic:
_panic_handler:
/* Pass to plat_panic_handler the address from where el3_panic was
* called, not the address of the call from el3_panic. */
- mov x30,x6
- no_ret plat_panic_handler
+ mov x30, x6
+ b plat_panic_handler
endfunc do_panic