diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-06 22:26:52 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-06 22:26:52 +0100 |
| commit | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch) | |
| tree | 01a9683776b38bf82c136aebbff9ec2a62540a33 /fs | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | ACPI: suspend: old debugging hacks sneaked back (diff) | |
| download | linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.tar.xz linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.zip | |
Pull suspend-2.6.24 into release branch
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 d568ae846741..8adebd3e43c6 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; |