diff options
| author | danh-arm <dan.handley@arm.com> | 2015-08-18 10:33:40 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-08-18 10:33:40 +0100 |
| commit | 01f1ebbb65ea5d50889c107920a3e43ea7fc8d7c (patch) | |
| tree | 549b5b2489adc9c3c775f4b168c37c778a23e86e /include | |
| parent | 432b9905d5e8bcf47a077bcda97f98538cee1034 (diff) | |
| parent | 80bb6afd23b29ffa9fec7c53e38d0402ddef42ba (diff) | |
Merge pull request #362 from jcastillo-arm/jc/inline
Fix build error with optimizations disabled (-O0)
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/arm_config.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/soc/common/soc_css.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/plat/arm/common/arm_config.h b/include/plat/arm/common/arm_config.h index 48fb33bd..0b161276 100644 --- a/include/plat/arm/common/arm_config.h +++ b/include/plat/arm/common/arm_config.h @@ -55,7 +55,7 @@ typedef struct arm_config { /* If used, arm_config must be defined and populated in the platform port */ extern arm_config_t arm_config; -inline const arm_config_t *get_arm_config(void) +static inline const arm_config_t *get_arm_config(void) { return &arm_config; } diff --git a/include/plat/arm/soc/common/soc_css.h b/include/plat/arm/soc/common/soc_css.h index 58f0f090..5f97cde1 100644 --- a/include/plat/arm/soc/common/soc_css.h +++ b/include/plat/arm/soc/common/soc_css.h @@ -37,7 +37,7 @@ void soc_css_init_nic400(void); void soc_css_init_pcie(void); -inline void soc_css_security_setup(void) +static inline void soc_css_security_setup(void) { soc_css_init_nic400(); soc_css_init_pcie(); |