lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull suspend-2.6.24 into release branch

Browse Source
This commit is contained in:
Len Brown
2007-12-06 16:26:52 -05:00
parent ceaeee6ad6 74d0f3338f
commit f7a5274d7d
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/acpi/wakeup_32.S
View File

@@ -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

5
drivers/hwmon/coretemp.c
View File

@@ -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;
} }

2
fs/jffs2/background.c
View File

@@ -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;