adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] suspend: fix suspend on single-CPU systems

Browse source 
Clark Williams reported that suspend doesnt work on his laptop on
2.6.20-rc1-rt kernels. The bug was introduced by the following cleanup
commit:

 commit 112cecb2cc
 Author: Siddha, Suresh B <suresh.b.siddha@intel.com>
 Date:   Wed Dec 6 20:34:31 2006 -0800

    [PATCH] suspend: don't change cpus_allowed for task initiating the suspend

because with this change 'error' is not initialized to 0 anymore, if
there are no other online CPUs. (i.e. if the system is single-CPU).

the fix is the initialize it to 0. The really weird thing is that my
version of gcc does not warn about this non-initialized variable
situation ...

(also fix the kernel printk in the error branch, it was missing a
 newline)

Reported-by: Clark Williams <williams@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Ingo Molnar 2006-12-23 16:55:29 +01:00 committed by Linus Torvalds
parent ffaa82008f
commit e1d9fd2e3d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/cpu.c
View file

@ -258,7 +258,7 @@ static cpumask_t frozen_cpus;
int disable_nonboot_cpus(void) int disable_nonboot_cpus(void)
{ {
int cpu, first_cpu, error; int cpu, first_cpu, error = 0;
mutex_lock(&cpu_add_remove_lock); mutex_lock(&cpu_add_remove_lock);
first_cpu = first_cpu(cpu_present_map); first_cpu = first_cpu(cpu_present_map);
@ -294,7 +294,7 @@ int disable_nonboot_cpus(void)
/* Make sure the CPUs won't be enabled by someone else */ /* Make sure the CPUs won't be enabled by someone else */
cpu_hotplug_disabled = 1; cpu_hotplug_disabled = 1;
} else { } else {
printk(KERN_ERR "Non-boot CPUs are not disabled"); printk(KERN_ERR "Non-boot CPUs are not disabled\n");
} }
out: out:
mutex_unlock(&cpu_add_remove_lock); mutex_unlock(&cpu_add_remove_lock);