diff options
| author | Jun Yan <juyan@nvidia.com> | 2013-07-25 11:35:06 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-07-25 20:26:32 -0700 |
| commit | 8728ae497732cb1db36c576db68e9f208e53982c (patch) | |
| tree | 8334cfdbece6352c8b999eefc3ef18990b2cf487 | |
| parent | c3602b567c7c15b0a78bf2a7ba63adc45fa786c5 (diff) | |
Revert "Revert "security: tf_driver: update with latest TL drop""
This reverts commit 8067f19868040be42e53bb05778138502c899632.
Change-Id: I6bf285be6a0ff3657d33bc3ecc99544cd4f83344
Signed-off-by: Jun Yan <juyan@nvidia.com>
Reviewed-on: http://git-master/r/253585
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com>
| -rw-r--r-- | security/tf_driver/tf_comm.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/security/tf_driver/tf_comm.c b/security/tf_driver/tf_comm.c index 01538249264f..c1f4f654632c 100644 --- a/security/tf_driver/tf_comm.c +++ b/security/tf_driver/tf_comm.c @@ -1226,17 +1226,10 @@ static int tf_send_recv(struct tf_comm *comm, bool wait_prepared = false; enum TF_COMMAND_STATE command_status = TF_COMMAND_STATE_PENDING; DEFINE_WAIT(wait); -#ifdef CONFIG_FREEZER - unsigned long saved_flags; -#endif + dprintk(KERN_INFO "[pid=%d] tf_send_recv(%p)\n", current->pid, command); -#ifdef CONFIG_FREEZER - saved_flags = current->flags; - current->flags |= PF_KTHREAD; -#endif - /* * Read all answers from the answer queue */ @@ -1251,15 +1244,8 @@ copy_answers: wake_up(&(comm->wait_queue)); #ifdef CONFIG_FREEZER - if (unlikely(freezing(current))) { - - dprintk(KERN_INFO - "Entering refrigerator.\n"); - try_to_freeze(); - dprintk(KERN_INFO - "Left refrigerator.\n"); + if (try_to_freeze()) goto copy_answers; - } #endif #ifndef CONFIG_PREEMPT @@ -1405,11 +1391,6 @@ exit: wait_prepared = false; } -#ifdef CONFIG_FREEZER - current->flags &= ~(PF_KTHREAD); - current->flags |= (saved_flags & PF_KTHREAD); -#endif - return result; } |