diff for duplicates of <1260889402.4165.434.camel@twins> diff --git a/a/1.txt b/N1/1.txt index 7c79205..f22deb8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,7 @@ index 4051d75..4be7de2 100644 @@ -369,12 +369,6 @@ static void __init smp_init(void) { unsigned int cpu; - +=20 - /* - * Set up the current CPU as possible to migrate to. - * The other ones will be done by cpu_up/cpu_down() @@ -21,9 +21,9 @@ index 4051d75..4be7de2 100644 - /* FIXME: This should be done in userspace --RR */ for_each_present_cpu(cpu) { - if (num_online_cpus() >= setup_max_cpus) + if (num_online_cpus() >=3D setup_max_cpus) @@ -486,6 +480,7 @@ static void __init boot_cpu_init(void) - int cpu = smp_processor_id(); + int cpu =3D smp_processor_id(); /* Mark the boot cpu "present", "online" etc for SMP and UP case */ set_cpu_online(cpu, true); + set_cpu_active(cpu, true); diff --git a/a/content_digest b/N1/content_digest index 9a401cb..579193e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,11 +10,10 @@ "Subject\0Re: [Next] CPU Hotplug test failures on powerpc\0" "Date\0Tue, 15 Dec 2009 16:03:22 +0100\0" "To\0Sachin Sant <sachinp@in.ibm.com>\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - Linux/PPC Development <linuxppc-dev@ozlabs.org> + "Cc\0Ingo Molnar <mingo@elte.hu>" + linux-next@vger.kernel.org linux-kernel <linux-kernel@vger.kernel.org> - Ingo Molnar <mingo@elte.hu> - " linux-next@vger.kernel.org\0" + " Linux/PPC Development <linuxppc-dev@ozlabs.org>\0" "\00:1\0" "b\0" "\n" @@ -31,7 +30,7 @@ "@@ -369,12 +369,6 @@ static void __init smp_init(void)\n" " {\n" " \tunsigned int cpu;\n" - " \n" + "=20\n" "-\t/*\n" "-\t * Set up the current CPU as possible to migrate to.\n" "-\t * The other ones will be done by cpu_up/cpu_down()\n" @@ -40,9 +39,9 @@ "-\n" " \t/* FIXME: This should be done in userspace --RR */\n" " \tfor_each_present_cpu(cpu) {\n" - " \t\tif (num_online_cpus() >= setup_max_cpus)\n" + " \t\tif (num_online_cpus() >=3D setup_max_cpus)\n" "@@ -486,6 +480,7 @@ static void __init boot_cpu_init(void)\n" - " \tint cpu = smp_processor_id();\n" + " \tint cpu =3D smp_processor_id();\n" " \t/* Mark the boot cpu \"present\", \"online\" etc for SMP and UP case */\n" " \tset_cpu_online(cpu, true);\n" "+\tset_cpu_active(cpu, true);\n" @@ -50,4 +49,4 @@ " \tset_cpu_possible(cpu, true);\n" } -ecde4a9577c97b3e4ba69f349a62a9275851d384919a9961f8a86e21a3a70c29 +2a3320a3301190aa68be172b7efa41bfa98b53e12c6bd75e4f08e0e9413906ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.