diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-28 18:53:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 18:53:30 +0000 |
| commit | 73a9605197ba04aaf02d436a2a4ad56e695b426c (patch) | |
| tree | 5beb6774d0dabeffdfb6dc3753e9eb4ac2f62754 /bl31 | |
| parent | fd50c18adbdb5b7c4cfd1f4661e905b56a7676fe (diff) | |
| parent | fd116b9f6c26d7fd49c7aa0cdbfb3d93871daec3 (diff) | |
Merge pull request #1282 from robertovargas-arm/misra-changes
Misra changes
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/bl31_context_mgmt.c | 4 | ||||
| -rw-r--r-- | bl31/bl31_main.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bl31/bl31_context_mgmt.c b/bl31/bl31_context_mgmt.c index 05bf4e17..123e623c 100644 --- a/bl31/bl31_context_mgmt.c +++ b/bl31/bl31_context_mgmt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -99,7 +99,7 @@ void cm_set_context_by_mpidr(uint64_t mpidr, void *context, uint32_t security_st * existing cm library routines. This function is expected to be invoked for * initializing the cpu_context for the CPU specified by MPIDR for first use. ******************************************************************************/ -void cm_init_context(unsigned long mpidr, const entry_point_info_t *ep) +void cm_init_context(uint64_t mpidr, const entry_point_info_t *ep) { if ((mpidr & MPIDR_AFFINITY_MASK) == (read_mpidr_el1() & MPIDR_AFFINITY_MASK)) diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index a34cf86d..06647412 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -17,6 +17,7 @@ #include <pmf.h> #include <runtime_instr.h> #include <runtime_svc.h> +#include <std_svc.h> #include <string.h> #if ENABLE_RUNTIME_INSTRUMENTATION |