projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation: add binding description of Rockchip PCIe controller
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
freezer.c
diff --git
a/kernel/freezer.c
b/kernel/freezer.c
index 4ada72f5f55adfb9b02bd01bc834407a0819c320..a8900a3bc27a895b65580a23a144e581bfe0149d 100644
(file)
--- a/
kernel/freezer.c
+++ b/
kernel/freezer.c
@@
-39,7
+39,7
@@
static DEFINE_SPINLOCK(freezer_lock);
*/
bool freezing_slow_path(struct task_struct *p)
{
*/
bool freezing_slow_path(struct task_struct *p)
{
- if (p->flags &
PF_NOFREEZE
)
+ if (p->flags &
(PF_NOFREEZE | PF_SUSPEND_TASK)
)
return false;
if (test_thread_flag(TIF_MEMDIE))
return false;
if (test_thread_flag(TIF_MEMDIE))
@@
-150,12
+150,6
@@
void __thaw_task(struct task_struct *p)
{
unsigned long flags;
{
unsigned long flags;
- /*
- * Clear freezing and kick @p if FROZEN. Clearing is guaranteed to
- * be visible to @p as waking up implies wmb. Waking up inside
- * freezer_lock also prevents wakeups from leaking outside
- * refrigerator.
- */
spin_lock_irqsave(&freezer_lock, flags);
if (frozen(p))
wake_up_process(p);
spin_lock_irqsave(&freezer_lock, flags);
if (frozen(p))
wake_up_process(p);