Skip to content

GitLab

Commit 3b15e9ad authored by Madhukar Pappireddy's avatar Madhukar Pappireddy Committed by TrustedFirmware Code Review
Browse files

Merge "fix(el3_runtime): correct CASSERT for pauth" into integration

parents f8bcfa8b b4f8d445
Hide whitespace changes
Inline Side-by-side
include/lib/el3_runtime/cpu_data.h
View file @ 3b15e9ad
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -125,7 +125,7 @@ extern cpu_data_t percpu_data[PLATFORM_CORE_COUNT]; ...@@ -125,7 +125,7 @@ extern cpu_data_t percpu_data[PLATFORM_CORE_COUNT];
#if ENABLE_PAUTH #if ENABLE_PAUTH
CASSERT(CPU_DATA_APIAKEY_OFFSET == __builtin_offsetof CASSERT(CPU_DATA_APIAKEY_OFFSET == __builtin_offsetof
(cpu_data_t, apiakey), (cpu_data_t, apiakey),
assert_cpu_data_crash_stack_offset_mismatch); assert_cpu_data_pauth_stack_offset_mismatch);
#endif #endif
#if CRASH_REPORTING #if CRASH_REPORTING
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment