diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /include/linux/freezer.h | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'include/linux/freezer.h')
| -rw-r--r-- | include/linux/freezer.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index 8f225339eee9..5a361f85cfec 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h | |||
| @@ -44,11 +44,6 @@ static inline bool should_send_signal(struct task_struct *p) | |||
| 44 | return !(p->flags & PF_FREEZER_NOSIG); | 44 | return !(p->flags & PF_FREEZER_NOSIG); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | /* | ||
| 48 | * Wake up a frozen process | ||
| 49 | */ | ||
| 50 | extern int __thaw_process(struct task_struct *p); | ||
| 51 | |||
| 52 | /* Takes and releases task alloc lock using task_lock() */ | 47 | /* Takes and releases task alloc lock using task_lock() */ |
| 53 | extern int thaw_process(struct task_struct *p); | 48 | extern int thaw_process(struct task_struct *p); |
| 54 | 49 | ||