Commit f7a5274d authored by Len Brown's avatar Len Brown

Pull suspend-2.6.24 into release branch

parents ceaeee6a 74d0f333
...@@ -35,10 +35,6 @@ wakeup_code: ...@@ -35,10 +35,6 @@ wakeup_code:
wakeup_code_start = . wakeup_code_start = .
.code16 .code16
movw $0xb800, %ax
movw %ax,%fs
movw $0x0e00 + 'L', %fs:(0x10)
cli cli
cld cld
......
...@@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, ...@@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
switch (action) { switch (action) {
case CPU_ONLINE: case CPU_ONLINE:
case CPU_ONLINE_FROZEN: case CPU_DOWN_FAILED:
coretemp_device_add(cpu); coretemp_device_add(cpu);
break; break;
case CPU_DEAD: case CPU_DOWN_PREPARE:
case CPU_DEAD_FROZEN:
coretemp_device_remove(cpu); coretemp_device_remove(cpu);
break; break;
} }
......
...@@ -105,7 +105,7 @@ static int jffs2_garbage_collect_thread(void *_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. /* 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; siginfo_t info;
unsigned long signr; unsigned long signr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment