diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 14:14:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 14:14:16 -0800 |
| commit | f194d132e4971111f85c18c96067acffb13cee6d (patch) | |
| tree | e7510b0f2300e059db3fbe850b68667af28531f0 /fs | |
| parent | 09f3eca2b7e2762e223fdd359f9d0f6303a85f6c (diff) | |
| parent | 982286d1b8e438f595cdc9304cc4c185c7b90a39 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: suspend: old debugging hacks sneaked back
Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2)
HWMON: coretemp, suspend fix
Freezer: Fix APM emulation breakage
Freezer: Fix s2disk resume from initrd
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/background.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c index d568ae84674..8adebd3e43c 100644 --- a/fs/jffs2/background.c +++ b/fs/jffs2/background.c @@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_c) /* Put_super will send a SIGKILL and then wait on the sem. */ - while (signal_pending(current)) { + while (signal_pending(current) || freezing(current)) { siginfo_t info; unsigned long signr; |