diff for duplicates of <200903161444.26659.rusty@rustcorp.com.au> diff --git a/a/1.txt b/N1/1.txt index bef1f61..8c153a1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,7 +49,7 @@ index 040bc87..7f2a456 100644 @@ -87,7 +87,7 @@ get_mmu_context (struct mm_struct *mm) /* re-check, now that we've got the lock: */ context = mm->context; - if (context = 0) { + if (context == 0) { - cpus_clear(mm->cpu_vm_mask); + cpumask_clear(mm_cpumask(mm)); if (ia64_ctx.next >= ia64_ctx.limit) { @@ -143,7 +143,7 @@ index 5229054..7700e23 100644 + set_cpu_possible(0, true); for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) { sapicid = smp_boot_data.cpu_phys_id[i]; - if (sapicid = boot_cpu_id) + if (sapicid == boot_cpu_id) continue; - cpu_set(cpu, cpu_present_map); - cpu_set(cpu, cpu_possible_map); @@ -269,8 +269,8 @@ index ecb9eb7..7053c55 100644 cpu = n; break; } -- if (++n = NR_CPUS) -+ if (++n = nr_cpu_ids) +- if (++n == NR_CPUS) ++ if (++n == nr_cpu_ids) n = 0; } @@ -278,8 +278,8 @@ index ecb9eb7..7053c55 100644 /* for next read, start checking at next CPU */ data->cpu_check = cpu; -- if (++data->cpu_check = NR_CPUS) -+ if (++data->cpu_check = nr_cpu_ids) +- if (++data->cpu_check == NR_CPUS) ++ if (++data->cpu_check == nr_cpu_ids) data->cpu_check = 0; snprintf(cmd, sizeof(cmd), "read %d\n", cpu); @@ -310,8 +310,8 @@ index 02c5b8a..1209777 100644 - for (cpu = 0; cpu < NR_CPUS; cpu++) + for (cpu = 0; cpu < nr_cpu_ids; cpu++) - if (cpuid_to_nasid(cpu) = nasid && - cpuid_to_slice(cpu) = slice) + if (cpuid_to_nasid(cpu) == nasid && + cpuid_to_slice(cpu) == slice) return cpu; diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index e585f9a..209e1eb 100644 @@ -435,11 +435,11 @@ index 32f3af1..6fbbf87 100644 extern void arch_fix_phys_package_id(int num, u32 slot); --#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) = -1 ? \ +-#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL : \ - node_to_cpumask(pcibus_to_node(bus)) \ - ) - - #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) = -1 ? \ + #define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ cpu_all_mask : \ cpumask_of_node(pcibus_to_node(bus))) diff --git a/a/content_digest b/N1/content_digest index 6ad8f67..f06035f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,14 @@ "From\0Rusty Russell <rusty@rustcorp.com.au>\0" "Subject\0[PULL] cpumask updates for ia64\0" - "Date\0Mon, 16 Mar 2009 04:26:26 +0000\0" + "Date\0Mon, 16 Mar 2009 14:44:26 +1030\0" "To\0Tony Luck <tony.luck@intel.com>\0" "Cc\0linux-ia64@vger.kernel.org" linux-kernel@vger.kernel.org mingo@redhat.com " travis@sgi.com\0" + "Cc\0linux-kernel@vger.kernel.org\0" + "Cc\0mingo@redhat.com\0" + "Cc\0travis@sgi.com\0" "\00:1\0" "b\0" "The following changes since commit 5bee17f18b595937e6beafeee5197868a3f74a06:\n" @@ -59,7 +62,7 @@ "@@ -87,7 +87,7 @@ get_mmu_context (struct mm_struct *mm)\n" " \t/* re-check, now that we've got the lock: */\n" " \tcontext = mm->context;\n" - " \tif (context = 0) {\n" + " \tif (context == 0) {\n" "-\t\tcpus_clear(mm->cpu_vm_mask);\n" "+\t\tcpumask_clear(mm_cpumask(mm));\n" " \t\tif (ia64_ctx.next >= ia64_ctx.limit) {\n" @@ -153,7 +156,7 @@ "+\tset_cpu_possible(0, true);\n" " \tfor (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {\n" " \t\tsapicid = smp_boot_data.cpu_phys_id[i];\n" - " \t\tif (sapicid = boot_cpu_id)\n" + " \t\tif (sapicid == boot_cpu_id)\n" " \t\t\tcontinue;\n" "-\t\tcpu_set(cpu, cpu_present_map);\n" "-\t\tcpu_set(cpu, cpu_possible_map);\n" @@ -279,8 +282,8 @@ " \t\t\tcpu = n;\n" " \t\t\tbreak;\n" " \t\t}\n" - "-\t\tif (++n = NR_CPUS)\n" - "+\t\tif (++n = nr_cpu_ids)\n" + "-\t\tif (++n == NR_CPUS)\n" + "+\t\tif (++n == nr_cpu_ids)\n" " \t\t\tn = 0;\n" " \t}\n" " \n" @@ -288,8 +291,8 @@ " \n" " \t/* for next read, start checking at next CPU */\n" " \tdata->cpu_check = cpu;\n" - "-\tif (++data->cpu_check = NR_CPUS)\n" - "+\tif (++data->cpu_check = nr_cpu_ids)\n" + "-\tif (++data->cpu_check == NR_CPUS)\n" + "+\tif (++data->cpu_check == nr_cpu_ids)\n" " \t\tdata->cpu_check = 0;\n" " \n" " \tsnprintf(cmd, sizeof(cmd), \"read %d\\n\", cpu);\n" @@ -320,8 +323,8 @@ " \n" "-\tfor (cpu = 0; cpu < NR_CPUS; cpu++)\n" "+\tfor (cpu = 0; cpu < nr_cpu_ids; cpu++)\n" - " \t\tif (cpuid_to_nasid(cpu) = nasid &&\n" - " \t\t\t\t\tcpuid_to_slice(cpu) = slice)\n" + " \t\tif (cpuid_to_nasid(cpu) == nasid &&\n" + " \t\t\t\t\tcpuid_to_slice(cpu) == slice)\n" " \t\t\treturn cpu;\n" "diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c\n" "index e585f9a..209e1eb 100644\n" @@ -445,13 +448,13 @@ " \n" " extern void arch_fix_phys_package_id(int num, u32 slot);\n" " \n" - "-#define pcibus_to_cpumask(bus)\t(pcibus_to_node(bus) = -1 ? \\\n" + "-#define pcibus_to_cpumask(bus)\t(pcibus_to_node(bus) == -1 ? \\\n" "-\t\t\t\t\tCPU_MASK_ALL : \\\n" "-\t\t\t\t\tnode_to_cpumask(pcibus_to_node(bus)) \\\n" "-\t\t\t\t)\n" "-\n" - " #define cpumask_of_pcibus(bus)\t(pcibus_to_node(bus) = -1 ?\t\t\\\n" + " #define cpumask_of_pcibus(bus)\t(pcibus_to_node(bus) == -1 ?\t\t\\\n" " \t\t\t\t cpu_all_mask :\t\t\t\t\\\n" " \t\t\t\t cpumask_of_node(pcibus_to_node(bus)))" -f71e38bf0a098951c062b6f21b6563239e4cf2c76243b6376d604fe4b2d48279 +68bee0b186e4b34be4ea2533ec4b76a750d1b0ab11a20e135b6c9dd12ca80715
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.