summaryrefslogtreecommitdiff
path: root/security/tf_driver/tf_comm_tz.c
diff options
context:
space:
mode:
authorRahul Prabhakar <rahulp@nvidia.com>2011-09-13 15:40:45 -0700
committerFrank Bourgeois <fbourgeois@nvidia.com>2011-09-21 18:03:43 -0700
commit7742e7756c0637ae5378e394ca03978826e31a78 (patch)
tree8cc31ae92f8e004adfb290ba035b4887bed088c9 /security/tf_driver/tf_comm_tz.c
parent47a4ffb6af7aec974ecb463ba7eb068422b3c3d4 (diff)
ARM: tegra: TrustedLogic drop 32055tegra-12r9-android-3.2
The WARs checked into 12r7: disable LP0/LP1 and slave LP2, and force maxcpus to 1 aren't needed when used with the newer tf_include.h from this TL drop. bug 868906 bug 870224 bug 877339 Change-Id: Ic3002b1d5fa09e8171c0d43bf6978ae96e51daf8 Reviewed-on: http://git-master/r/53324 Reviewed-by: Rahul Prabhakar <rahulp@nvidia.com> Tested-by: Rahul Prabhakar <rahulp@nvidia.com> Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Reviewed-by: Jonathan White <jwhite@nvidia.com>
Diffstat (limited to 'security/tf_driver/tf_comm_tz.c')
-rw-r--r--security/tf_driver/tf_comm_tz.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/tf_driver/tf_comm_tz.c b/security/tf_driver/tf_comm_tz.c
index 2d359c2138ba..567b22c1ad9a 100644
--- a/security/tf_driver/tf_comm_tz.c
+++ b/security/tf_driver/tf_comm_tz.c
@@ -195,7 +195,7 @@ static inline void tf_smc_nyield(void)
}
/* Yields the Secure World */
-int tf_schedule_secure_world(struct tf_comm *comm, bool prepare_exit)
+int tf_schedule_secure_world(struct tf_comm *comm)
{
tf_set_current_time(comm);
@@ -503,7 +503,7 @@ int tf_pm_hibernate(struct tf_comm *comm)
}
spin_unlock(&(comm->lock));
- (void)tf_schedule_secure_world(comm, false);
+ (void)tf_schedule_secure_world(comm);
}
/* now wait for the answer, dispatching other answers */
@@ -597,7 +597,7 @@ int tf_pm_hibernate(struct tf_comm *comm)
* no need to check its timeout and schedule() the current
* thread
*/
- (void)tf_schedule_secure_world(comm, false);
+ (void)tf_schedule_secure_world(comm);
} /* while (1) */
printk(KERN_INFO "tf_driver: hibernate.\n");
@@ -833,7 +833,7 @@ int tf_init(struct tf_comm *comm)
*/
/* yield for the first time */
- (void)tf_schedule_secure_world(comm, false);
+ (void)tf_schedule_secure_world(comm);
dprintk(KERN_INFO "tf_init(): Success\n");
return S_SUCCESS;