Merge changes from topic "db/unsigned_long" into integration

[project/bcm63xx/atf.git] / lib / el3_runtime / aarch64 / context_mgmt.c

diff --git a/lib/el3_runtime/aarch64/context_mgmt.c b/lib/el3_runtime/aarch64/context_mgmt.c
index 446d9da92597cd7a2b6b6b2f46434ddc0290a826..a05ee5a6e4970542d6a592f0ef0a8606a2c923a1 100644 (file)
--- a/lib/el3_runtime/aarch64/context_mgmt.c
+++ b/lib/el3_runtime/aarch64/context_mgmt.c
@@ -69,7 +69,7 @@ void cm_setup_context(cpu_context_t *ctx, const entry_point_info_t *ep)
        uint32_t scr_el3;
        el3_state_t *state;
        gp_regs_t *gp_regs;
-       unsigned long sctlr_elx, actlr_elx;
+       u_register_t sctlr_elx, actlr_elx;
 
        assert(ctx != NULL);