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 | |
| 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
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 4 | ||||
| -rw-r--r-- | drivers/hwmon/coretemp.c | 5 | ||||
| -rw-r--r-- | fs/jffs2/background.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index a97313b1270e..1e931aaf2ef6 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -35,10 +35,6 @@ wakeup_code: wakeup_code_start = . .code16 - movw $0xb800, %ax - movw %ax,%fs - movw $0x0e00 + 'L', %fs:(0x10) - cli cld diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5c82ec7f8bbd..3ee60d26e3a2 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, switch (action) { case CPU_ONLINE: - case CPU_ONLINE_FROZEN: + case CPU_DOWN_FAILED: coretemp_device_add(cpu); break; - case CPU_DEAD: - case CPU_DEAD_FROZEN: + case CPU_DOWN_PREPARE: coretemp_device_remove(cpu); break; } 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; |