diff options
| author | danh-arm <dan.handley@arm.com> | 2016-04-18 12:04:22 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-04-18 12:04:22 +0100 |
| commit | 81b491ff37a7027766410a91d9837e093248300d (patch) | |
| tree | b0e331167b26e40a35cea27a9828b58610d47864 /include | |
| parent | 7b4838e4fc4b55522b59fa69ac53c81237458c6e (diff) | |
| parent | 10c252c14b7f446c0b49ef1aafbd5d37804577dd (diff) | |
Merge pull request #595 from sandrine-bailleux-arm/sb/unoptimised-build
Add support for unoptimised (-O0) build
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/context_mgmt.h | 3 | ||||
| -rw-r--r-- | include/lib/bakery_lock.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/common/context_mgmt.h b/include/common/context_mgmt.h index 11786a18..a76ecbe3 100644 --- a/include/common/context_mgmt.h +++ b/include/common/context_mgmt.h @@ -55,7 +55,6 @@ void cm_set_context_by_index(unsigned int cpu_idx, unsigned int security_state); void *cm_get_context(uint32_t security_state); void cm_set_context(void *context, uint32_t security_state); -inline void cm_set_next_context(void *context); void cm_init_context(uint64_t mpidr, const struct entry_point_info *ep) __deprecated; void cm_init_my_context(const struct entry_point_info *ep); @@ -80,7 +79,7 @@ uint32_t cm_get_scr_el3(uint32_t security_state); * return. This initializes the SP_EL3 to a pointer to a 'cpu_context' set for * the required security state ******************************************************************************/ -inline void cm_set_next_context(void *context) +static inline void cm_set_next_context(void *context) { #if DEBUG uint64_t sp_mode; diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index 8a538917..6b8157e6 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -96,7 +96,7 @@ typedef bakery_info_t bakery_lock_t; #endif /* __USE_COHERENT_MEM__ */ -inline void bakery_lock_init(bakery_lock_t *bakery) {} +static inline void bakery_lock_init(bakery_lock_t *bakery) {} void bakery_lock_get(bakery_lock_t *bakery); void bakery_lock_release(bakery_lock_t *bakery); |