Merge pull request #925 from dp-arm/dp/spdx

[project/bcm63xx/atf.git] / common / runtime_svc.c

diff --git a/common/runtime_svc.c b/common/runtime_svc.c
index 8b8145e232a78a34854fd63c96e772fdaad128ac..7b38847be9f9bf0ccce3bf9cfce11cdc9b4999a8 100644 (file)
--- a/common/runtime_svc.c
+++ b/common/runtime_svc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -69,7 +69,8 @@ static int32_t validate_rt_svc_desc(const rt_svc_desc_t *desc)
        if (desc->end_oen >= OEN_LIMIT)
                return -EINVAL;
 
-       if (desc->call_type != SMC_TYPE_FAST && desc->call_type != SMC_TYPE_STD)
+       if (desc->call_type != SMC_TYPE_FAST &&
+                       desc->call_type != SMC_TYPE_YIELD)
                return -EINVAL;
 
        /* A runtime service having no init or handle function doesn't make sense */
@@ -119,7 +120,7 @@ void runtime_svc_init(void)
 
                /*
                 * The runtime service may have separate rt_svc_desc_t
-                * for its fast smc and standard smc. Since the service itself
+                * for its fast smc and yielding smc. Since the service itself
                 * need to be initialized only once, only one of them will have
                 * an initialisation routine defined. Call the initialisation
                 * routine for this runtime service, if it is defined.