diff options
| author | Hyung Taek Ryoo <hryoo@nvidia.com> | 2013-07-17 19:02:10 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-07-23 18:49:49 -0700 |
| commit | a7740d800cce053059b40241b5f9247f9563e342 (patch) | |
| tree | 4ad93341fb3765cea4470465d221df32758c8df3 /security | |
| parent | f3dcc8c33607e57e6e71bd05be8ecfb26f9af79c (diff) | |
security: tf_driver: update with latest TL drop
K3.4 does not need this code maintain to PF_KTHREAD
Bug 1244750
Change-Id: Iec2fdf2cf4646ea3415f370a45376b1757498854
Signed-off-by: Hyung Taek Ryoo <hryoo@nvidia.com>
Reviewed-on: http://git-master/r/250493
Reviewed-by: Karthik Iyer <karthiki@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'security')
| -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; } |