diff options
author | Len Brown <len.brown@intel.com> | 2007-12-06 16:26:52 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-12-06 16:26:52 -0500 |
commit | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch) | |
tree | 01a9683776b38bf82c136aebbff9ec2a62540a33 /fs | |
parent | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff) | |
parent | 74d0f3338fbb3c69894968df1fedaf10c88cd0e4 (diff) | |
download | linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.tar.gz linux-f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce.tar.bz2 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; |