diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /include/linux/sched.h | |
| parent | 8b9411014e6f18a883c18b38f41338dbd53fddea (diff) | |
| parent | e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 6afa72e080cb..6674fc1e51bf 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1558,6 +1558,14 @@ static inline void freeze(struct task_struct *p) | |||
| 1558 | } | 1558 | } |
| 1559 | 1559 | ||
| 1560 | /* | 1560 | /* |
| 1561 | * Sometimes we may need to cancel the previous 'freeze' request | ||
| 1562 | */ | ||
| 1563 | static inline void do_not_freeze(struct task_struct *p) | ||
| 1564 | { | ||
| 1565 | p->flags &= ~PF_FREEZE; | ||
| 1566 | } | ||
| 1567 | |||
| 1568 | /* | ||
| 1561 | * Wake up a frozen process | 1569 | * Wake up a frozen process |
| 1562 | */ | 1570 | */ |
| 1563 | static inline int thaw_process(struct task_struct *p) | 1571 | static inline int thaw_process(struct task_struct *p) |