diff for duplicates of <200903161444.41621.rusty@rustcorp.com.au> diff --git a/a/1.txt b/N1/1.txt index 2540dec..ae150ae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -108,7 +108,7 @@ index be1ae37..132d81f 100644 cpu_clear(smp_processor_id(), cpu_mask); if (!cpus_empty(cpu_mask)) { xc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm); - if(atomic_read(&mm->mm_users) = 1 && current->active_mm = mm) + if(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm) - mm->cpu_vm_mask = cpumask_of_cpu(smp_processor_id()); + cpumask_copy(mm_cpumask(mm), + cpumask_of(smp_processor_id())); @@ -176,7 +176,7 @@ index 4e17eec..2de937c 100644 @@ -1055,13 +1055,13 @@ void smp_flush_tlb_mm(struct mm_struct *mm) int cpu = get_cpu(); - if (atomic_read(&mm->mm_users) = 1) { + if (atomic_read(&mm->mm_users) == 1) { - mm->cpu_vm_mask = cpumask_of_cpu(cpu); + cpumask_copy(mm_cpumask(mm), cpumask_of(cpu)); goto local_flush_and_out; @@ -192,7 +192,7 @@ index 4e17eec..2de937c 100644 @@ -1075,11 +1075,11 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned long int cpu = get_cpu(); - if (mm = current->active_mm && atomic_read(&mm->mm_users) = 1) + if (mm == current->active_mm && atomic_read(&mm->mm_users) == 1) - mm->cpu_vm_mask = cpumask_of_cpu(cpu); + cpumask_copy(mm_cpumask(mm), cpumask_of(cpu)); else @@ -247,7 +247,7 @@ index a5ba4ad..39624ab 100644 @@ -45,7 +45,7 @@ static inline int pcibus_to_node(struct pci_bus *pbus) #define cpumask_of_pcibus(bus) \ - (pcibus_to_node(bus) = -1 ? \ + (pcibus_to_node(bus) == -1 ? \ - CPU_MASK_ALL_PTR : \ + cpu_all_mask : \ cpumask_of_node(pcibus_to_node(bus))) @@ -275,11 +275,11 @@ index 430ce39..a5ba4ad 100644 #endif -#define pcibus_to_cpumask(bus) \ -- (pcibus_to_node(bus) = -1 ? \ +- (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 ? \ + (pcibus_to_node(bus) == -1 ? \ CPU_MASK_ALL_PTR : \ commit 7b45101d09ab13eafc0c3a5232e1606654d122ea @@ -426,7 +426,7 @@ index 57c3984..90350f8 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c @@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp, - if (cpu_list[i] = CPU_SENTINEL) + if (cpu_list[i] == CPU_SENTINEL) continue; - if (cpu_list[i] < NR_CPUS) diff --git a/a/content_digest b/N1/content_digest index f0a15b9..4e08b61 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,14 @@ - "ref\0200903041055.58464.rusty@rustcorp.com.au\0" "From\0Rusty Russell <rusty@rustcorp.com.au>\0" "Subject\0[PULL] cpumask updates for sparc\0" - "Date\0Mon, 16 Mar 2009 04:26:41 +0000\0" + "Date\0Mon, 16 Mar 2009 14:44:41 +1030\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0sparclinux@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" @@ -119,7 +121,7 @@ " \t\tcpu_clear(smp_processor_id(), cpu_mask);\n" " \t\tif (!cpus_empty(cpu_mask)) {\n" " \t\t\txc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm);\n" - " \t\t\tif(atomic_read(&mm->mm_users) = 1 && current->active_mm = mm)\n" + " \t\t\tif(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm)\n" "-\t\t\t\tmm->cpu_vm_mask = cpumask_of_cpu(smp_processor_id());\n" "+\t\t\t\tcpumask_copy(mm_cpumask(mm),\n" "+\t\t\t\t\t cpumask_of(smp_processor_id()));\n" @@ -187,7 +189,7 @@ "@@ -1055,13 +1055,13 @@ void smp_flush_tlb_mm(struct mm_struct *mm)\n" " \tint cpu = get_cpu();\n" " \n" - " \tif (atomic_read(&mm->mm_users) = 1) {\n" + " \tif (atomic_read(&mm->mm_users) == 1) {\n" "-\t\tmm->cpu_vm_mask = cpumask_of_cpu(cpu);\n" "+\t\tcpumask_copy(mm_cpumask(mm), cpumask_of(cpu));\n" " \t\tgoto local_flush_and_out;\n" @@ -203,7 +205,7 @@ "@@ -1075,11 +1075,11 @@ void smp_flush_tlb_pending(struct mm_struct *mm, unsigned long nr, unsigned long\n" " \tint cpu = get_cpu();\n" " \n" - " \tif (mm = current->active_mm && atomic_read(&mm->mm_users) = 1)\n" + " \tif (mm == current->active_mm && atomic_read(&mm->mm_users) == 1)\n" "-\t\tmm->cpu_vm_mask = cpumask_of_cpu(cpu);\n" "+\t\tcpumask_copy(mm_cpumask(mm), cpumask_of(cpu));\n" " \telse\n" @@ -258,7 +260,7 @@ "@@ -45,7 +45,7 @@ static inline int pcibus_to_node(struct pci_bus *pbus)\n" " \n" " #define cpumask_of_pcibus(bus)\t\\\n" - " \t(pcibus_to_node(bus) = -1 ? \\\n" + " \t(pcibus_to_node(bus) == -1 ? \\\n" "-\t CPU_MASK_ALL_PTR : \\\n" "+\t cpu_all_mask : \\\n" " \t cpumask_of_node(pcibus_to_node(bus)))\n" @@ -286,11 +288,11 @@ " #endif\n" " \n" "-#define pcibus_to_cpumask(bus)\t\\\n" - "-\t(pcibus_to_node(bus) = -1 ? \\\n" + "-\t(pcibus_to_node(bus) == -1 ? \\\n" "-\t CPU_MASK_ALL : \\\n" "-\t node_to_cpumask(pcibus_to_node(bus)))\n" " #define cpumask_of_pcibus(bus)\t\\\n" - " \t(pcibus_to_node(bus) = -1 ? \\\n" + " \t(pcibus_to_node(bus) == -1 ? \\\n" " \t CPU_MASK_ALL_PTR : \\\n" "\n" "commit 7b45101d09ab13eafc0c3a5232e1606654d122ea\n" @@ -437,7 +439,7 @@ "--- a/arch/sparc/kernel/ds.c\n" "+++ b/arch/sparc/kernel/ds.c\n" "@@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp,\n" - " \t\tif (cpu_list[i] = CPU_SENTINEL)\n" + " \t\tif (cpu_list[i] == CPU_SENTINEL)\n" " \t\t\tcontinue;\n" " \n" "-\t\tif (cpu_list[i] < NR_CPUS)\n" @@ -658,4 +660,4 @@ " \n" extern unsigned long xcall_flush_tlb_mm; -f78ab53b52781079c5e4987188b100c8dde7f6772d16006897175a1216dad6f1 +bdfd60c3458bb7cead1dd00851c54e6e0d5b377605f917febb19cbecccac0f33
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.