Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d9fd2e authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

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



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 112cecb2
 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: default avatarClark Williams <williams@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ffaa8200

kernel/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static cpumask_t frozen_cpus; 


int disable_nonboot_cpus(void)

{

	int cpu, first_cpu, error;

	int cpu, first_cpu, error = 0;



	mutex_lock(&cpu_add_remove_lock);

	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 */

		cpu_hotplug_disabled = 1;

	} else {

		printk(KERN_ERR "Non-boot CPUs are not disabled");

		printk(KERN_ERR "Non-boot CPUs are not disabled\n");

	}

out:

	mutex_unlock(&cpu_add_remove_lock);