aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2021-08-20 18:22:51 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-08-20 18:22:51 +0200
commit3b15e9ad11949fb6f7029bf69e3db9feab052d6f (patch)
treebbb2c6db59472bc06b91a1a17380b879a48b09ab
parentf8bcfa8b76fb03ad8c6a1242ac8ce7fb05a47f4a (diff)
parentb4f8d44597faf641177134ee08db7c3fcef5aa14 (diff)
downloadarm-trusted-firmware-3b15e9ad11949fb6f7029bf69e3db9feab052d6f.tar.gz
Merge "fix(el3_runtime): correct CASSERT for pauth" into integration
-rw-r--r--include/lib/el3_runtime/cpu_data.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/lib/el3_runtime/cpu_data.h b/include/lib/el3_runtime/cpu_data.h
index 54261358e..3d57a5c59 100644
--- a/include/lib/el3_runtime/cpu_data.h
+++ b/include/lib/el3_runtime/cpu_data.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -125,7 +125,7 @@ extern cpu_data_t percpu_data[PLATFORM_CORE_COUNT];
#if ENABLE_PAUTH
CASSERT(CPU_DATA_APIAKEY_OFFSET == __builtin_offsetof
(cpu_data_t, apiakey),
- assert_cpu_data_crash_stack_offset_mismatch);
+ assert_cpu_data_pauth_stack_offset_mismatch);
#endif
#if CRASH_REPORTING