diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 19:44:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-02 19:44:42 -0700 |
| commit | 24b99d1576e6e330c2eba534a793b6e6dcb37f6b (patch) | |
| tree | c8ad2d4ad7e06161d1b12013e91bf34d5eb9f556 /include | |
| parent | 6da8d866d0d39e9509ff826660f6a86a6757c966 (diff) | |
| parent | 5a7aadfe2fcb0f69e2acc1fbefe22a096e792fc9 (diff) | |
| download | linux-3.10-24b99d1576e6e330c2eba534a793b6e6dcb37f6b.tar.gz linux-3.10-24b99d1576e6e330c2eba534a793b6e6dcb37f6b.tar.bz2 linux-3.10-24b99d1576e6e330c2eba534a793b6e6dcb37f6b.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
Freezer: Only show the state of tasks refusing to freeze
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/freezer.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/freezer.h b/include/linux/freezer.h index 5a361f85cfe..da7e52b099f 100644 --- a/include/linux/freezer.h +++ b/include/linux/freezer.h @@ -64,9 +64,12 @@ extern bool freeze_task(struct task_struct *p, bool sig_only); extern void cancel_freezing(struct task_struct *p); #ifdef CONFIG_CGROUP_FREEZER -extern int cgroup_frozen(struct task_struct *task); +extern int cgroup_freezing_or_frozen(struct task_struct *task); #else /* !CONFIG_CGROUP_FREEZER */ -static inline int cgroup_frozen(struct task_struct *task) { return 0; } +static inline int cgroup_freezing_or_frozen(struct task_struct *task) +{ + return 0; +} #endif /* !CONFIG_CGROUP_FREEZER */ /* |