diff for duplicates of <1253682382-24740-3-git-send-email-tj@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 509220d..1258c92 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,10 +34,11 @@ index baec6f0..40574ae 100644 "Error parsing MADT - no LAPIC entries\n"); +#ifdef CONFIG_SMP -+ if (available_cpus = 0) { ++ if (available_cpus == 0) { + printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n"); + printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id()); -+ smp_boot_data.cpu_phys_id[available_cpus] + hard_smp_processor_id(); ++ smp_boot_data.cpu_phys_id[available_cpus] = ++ hard_smp_processor_id(); + available_cpus = 1; /* We've got at least one of these, no? */ + } + smp_boot_data.cpu_count = available_cpus; @@ -60,21 +61,23 @@ index baec6f0..40574ae 100644 +#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_SMP -- if (available_cpus = 0) { +- if (available_cpus == 0) { - printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n"); - printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id()); -- smp_boot_data.cpu_phys_id[available_cpus] - hard_smp_processor_id(); +- smp_boot_data.cpu_phys_id[available_cpus] = +- hard_smp_processor_id(); - available_cpus = 1; /* We've got at least one of these, no? */ - } - smp_boot_data.cpu_count = available_cpus; - - smp_build_cpu_map(); -# ifdef CONFIG_ACPI_NUMA - if (srat_num_cpus = 0) { + if (srat_num_cpus == 0) { int cpu, i = 1; for (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++) @@ -789,14 +791,9 @@ int __init acpi_boot_init(void) - node_cpuid[i++].phys_id smp_boot_data.cpu_phys_id[cpu]; + node_cpuid[i++].phys_id = + smp_boot_data.cpu_phys_id[cpu]; } -# endif #endif @@ -100,7 +103,7 @@ index 1de86c9..5d77c1e 100644 prefill_possible_map(); -#endif +# endif - per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) = 0 ? + per_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ? 32 : cpus_weight(early_cpu_possible_map)), additional_cpus > 0 ? additional_cpus : 0); # endif diff --git a/a/content_digest b/N1/content_digest index a13db84..7267104 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01253682382-24740-1-git-send-email-tj@kernel.org\0" "From\0Tejun Heo <tj@kernel.org>\0" "Subject\0[PATCH 2/5] ia64: initialize cpu maps early\0" - "Date\0Wed, 23 Sep 2009 05:06:19 +0000\0" + "Date\0Wed, 23 Sep 2009 14:06:19 +0900\0" "To\0Nick Piggin <npiggin@suse.de>" Tony Luck <tony.luck@intel.com> Fenghua Yu <fenghua.yu@intel.com> @@ -52,10 +52,11 @@ " \t\t \"Error parsing MADT - no LAPIC entries\\n\");\n" " \n" "+#ifdef CONFIG_SMP\n" - "+\tif (available_cpus = 0) {\n" + "+\tif (available_cpus == 0) {\n" "+\t\tprintk(KERN_INFO \"ACPI: Found 0 CPUS; assuming 1\\n\");\n" "+\t\tprintk(KERN_INFO \"CPU 0 (0x%04x)\", hard_smp_processor_id());\n" - "+\t\tsmp_boot_data.cpu_phys_id[available_cpus] +\t\t hard_smp_processor_id();\n" + "+\t\tsmp_boot_data.cpu_phys_id[available_cpus] =\n" + "+\t\t hard_smp_processor_id();\n" "+\t\tavailable_cpus = 1;\t/* We've got at least one of these, no? */\n" "+\t}\n" "+\tsmp_boot_data.cpu_count = available_cpus;\n" @@ -78,21 +79,23 @@ " \n" "+#ifdef CONFIG_ACPI_NUMA\n" " #ifdef CONFIG_SMP\n" - "-\tif (available_cpus = 0) {\n" + "-\tif (available_cpus == 0) {\n" "-\t\tprintk(KERN_INFO \"ACPI: Found 0 CPUS; assuming 1\\n\");\n" "-\t\tprintk(KERN_INFO \"CPU 0 (0x%04x)\", hard_smp_processor_id());\n" - "-\t\tsmp_boot_data.cpu_phys_id[available_cpus] -\t\t hard_smp_processor_id();\n" + "-\t\tsmp_boot_data.cpu_phys_id[available_cpus] =\n" + "-\t\t hard_smp_processor_id();\n" "-\t\tavailable_cpus = 1;\t/* We've got at least one of these, no? */\n" "-\t}\n" "-\tsmp_boot_data.cpu_count = available_cpus;\n" "-\n" "-\tsmp_build_cpu_map();\n" "-# ifdef CONFIG_ACPI_NUMA\n" - " \tif (srat_num_cpus = 0) {\n" + " \tif (srat_num_cpus == 0) {\n" " \t\tint cpu, i = 1;\n" " \t\tfor (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++)\n" "@@ -789,14 +791,9 @@ int __init acpi_boot_init(void)\n" - " \t\t\t\tnode_cpuid[i++].phys_id \t\t\t\t smp_boot_data.cpu_phys_id[cpu];\n" + " \t\t\t\tnode_cpuid[i++].phys_id =\n" + " \t\t\t\t smp_boot_data.cpu_phys_id[cpu];\n" " \t}\n" "-# endif\n" " #endif\n" @@ -118,7 +121,7 @@ " \tprefill_possible_map();\n" "-#endif\n" "+# endif\n" - " \tper_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) = 0 ?\n" + " \tper_cpu_scan_finalize((cpus_weight(early_cpu_possible_map) == 0 ?\n" " \t\t32 : cpus_weight(early_cpu_possible_map)),\n" " \t\tadditional_cpus > 0 ? additional_cpus : 0);\n" " # endif\n" @@ -137,4 +140,4 @@ "-- \n" 1.6.4.2 -0ec93eed500d8a1c8c9f54cb77a9837bd4b23c590191080a811a7022dff3a2fe +5440dbc00c1f24c4b885dc4fd29d13374a8f1251c3374772b5323255cbeaf369
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.