diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-05-09 13:40:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 13:40:35 +0100 |
| commit | 885ca54a75e14a63c375b5d12852dc7ef2c0b568 (patch) | |
| tree | e7ade3b6684269f55a38bef3fa2bc068c71457fc | |
| parent | 22fa3a2759b37094c8bcc02f7de95c00992526c3 (diff) | |
| parent | d92a2863365f7dcb8caf8b6f9535d6a8870e81cb (diff) | |
Merge pull request #1377 from robertovargas-arm/compiler-warnings
Compiler warnings
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_arch.h | 4 | ||||
| -rw-r--r-- | lib/xlat_tables_v2/xlat_tables_internal.c | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/include/lib/xlat_tables/xlat_tables_arch.h b/include/lib/xlat_tables/xlat_tables_arch.h index 165b161d..af8c4633 100644 --- a/include/lib/xlat_tables/xlat_tables_arch.h +++ b/include/lib/xlat_tables/xlat_tables_arch.h @@ -21,8 +21,8 @@ * limits. Not that these limits are different for AArch32 and AArch64. */ #define CHECK_VIRT_ADDR_SPACE_SIZE(size) \ - (((size) >= MIN_VIRT_ADDR_SPACE_SIZE) && \ - ((size) <= MAX_VIRT_ADDR_SPACE_SIZE) && \ + (((unsigned long long)(size) >= MIN_VIRT_ADDR_SPACE_SIZE) && \ + ((unsigned long long)(size) <= MAX_VIRT_ADDR_SPACE_SIZE) && \ IS_POWER_OF_TWO(size)) /* diff --git a/lib/xlat_tables_v2/xlat_tables_internal.c b/lib/xlat_tables_v2/xlat_tables_internal.c index 584d7c47..8be6d942 100644 --- a/lib/xlat_tables_v2/xlat_tables_internal.c +++ b/lib/xlat_tables_v2/xlat_tables_internal.c @@ -1066,18 +1066,19 @@ static void xlat_desc_print(const xlat_ctx_t *ctx, uint64_t desc) if (xlat_regime == EL3_REGIME) { /* For EL3, the AP[2] bit is all what matters */ - tf_printf((desc & LOWER_ATTRS(AP_RO)) ? ro_str : rw_str); + tf_printf("%s", (desc & LOWER_ATTRS(AP_RO)) ? ro_str : rw_str); } else { const char *ap_str = (desc & LOWER_ATTRS(AP_RO)) ? ro_str : rw_str; - tf_printf(ap_str); - tf_printf(priv_str); + tf_printf("%s", ap_str); + tf_printf("%s", priv_str); /* * EL0 can only have the same permissions as EL1 or no * permissions at all. */ - tf_printf((desc & LOWER_ATTRS(AP_ACCESS_UNPRIVILEGED)) + tf_printf("%s", + (desc & LOWER_ATTRS(AP_ACCESS_UNPRIVILEGED)) ? ap_str : no_access_str); - tf_printf(user_str); + tf_printf("%s", user_str); } const char *xn_str = "-XN"; @@ -1085,14 +1086,14 @@ static void xlat_desc_print(const xlat_ctx_t *ctx, uint64_t desc) if (xlat_regime == EL3_REGIME) { /* For EL3, the XN bit is all what matters */ - tf_printf(LOWER_ATTRS(XN) & desc ? xn_str : exec_str); + tf_printf("%s", LOWER_ATTRS(XN) & desc ? xn_str : exec_str); } else { /* For EL0 and EL1, we need to know who has which rights */ - tf_printf(LOWER_ATTRS(PXN) & desc ? xn_str : exec_str); - tf_printf(priv_str); + tf_printf("%s", LOWER_ATTRS(PXN) & desc ? xn_str : exec_str); + tf_printf("%s", priv_str); - tf_printf(LOWER_ATTRS(UXN) & desc ? xn_str : exec_str); - tf_printf(user_str); + tf_printf("%s", LOWER_ATTRS(UXN) & desc ? xn_str : exec_str); + tf_printf("%s", user_str); } tf_printf(LOWER_ATTRS(NS) & desc ? "-NS" : "-S"); |