45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
|
From 347298b26389602f5e61d65ca6c9f5788702159f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Date: Fri, 22 Jul 2011 08:07:08 +0200
|
||
|
|
Subject: [PATCH 088/365] signal: Make __lock_task_sighand() RT aware
|
||
|
|
|
||
|
|
local_irq_save() + spin_lock(&sighand->siglock) does not work on
|
||
|
|
-RT. Use the nort variants.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
---
|
||
|
|
kernel/signal.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kernel/signal.c b/kernel/signal.c
|
||
|
|
index 09c0f647ce17..77354d135ea9 100644
|
||
|
|
--- a/kernel/signal.c
|
||
|
|
+++ b/kernel/signal.c
|
||
|
|
@@ -1344,12 +1344,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
|
||
|
|
* Disable interrupts early to avoid deadlocks.
|
||
|
|
* See rcu_read_unlock() comment header for details.
|
||
|
|
*/
|
||
|
|
- local_irq_save(*flags);
|
||
|
|
+ local_irq_save_nort(*flags);
|
||
|
|
rcu_read_lock();
|
||
|
|
sighand = rcu_dereference(tsk->sighand);
|
||
|
|
if (unlikely(sighand == NULL)) {
|
||
|
|
rcu_read_unlock();
|
||
|
|
- local_irq_restore(*flags);
|
||
|
|
+ local_irq_restore_nort(*flags);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
/*
|
||
|
|
@@ -1370,7 +1370,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
|
||
|
|
}
|
||
|
|
spin_unlock(&sighand->siglock);
|
||
|
|
rcu_read_unlock();
|
||
|
|
- local_irq_restore(*flags);
|
||
|
|
+ local_irq_restore_nort(*flags);
|
||
|
|
}
|
||
|
|
|
||
|
|
return sighand;
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|