diff for duplicates of <20140117151837.930994765@linux.com> diff --git a/a/1.txt b/N1/1.txt index f2c6554..bb9432f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -108,7 +108,8 @@ Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Christoph Lameter <cl@linux.com> Index: linux/arch/sparc/include/asm/cpudata_32.h -=================================--- linux.orig/arch/sparc/include/asm/cpudata_32.h 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/include/asm/cpudata_32.h 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/include/asm/cpudata_32.h 2013-12-02 16:07:59.764356512 -0600 @@ -26,6 +26,6 @@ typedef struct { @@ -119,7 +120,8 @@ Index: linux/arch/sparc/include/asm/cpudata_32.h #endif /* _SPARC_CPUDATA_H */ Index: linux/arch/sparc/include/asm/cpudata_64.h -=================================--- linux.orig/arch/sparc/include/asm/cpudata_64.h 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/include/asm/cpudata_64.h 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/include/asm/cpudata_64.h 2013-12-02 16:07:59.764356512 -0600 @@ -33,7 +33,7 @@ typedef struct { @@ -131,7 +133,8 @@ Index: linux/arch/sparc/include/asm/cpudata_64.h extern const struct seq_operations cpuinfo_op; Index: linux/arch/sparc/kernel/kprobes.c -=================================--- linux.orig/arch/sparc/kernel/kprobes.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/kprobes.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/kprobes.c 2013-12-02 16:07:59.764356512 -0600 @@ -83,7 +83,7 @@ static void __kprobes save_previous_kpro @@ -161,7 +164,8 @@ Index: linux/arch/sparc/kernel/kprobes.c goto ss_probe; } Index: linux/arch/sparc/kernel/leon_smp.c -=================================--- linux.orig/arch/sparc/kernel/leon_smp.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/leon_smp.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/leon_smp.c 2013-12-02 16:07:59.764356512 -0600 @@ -354,7 +354,7 @@ static void leon_ipi_resched(int cpu) @@ -173,7 +177,8 @@ Index: linux/arch/sparc/kernel/leon_smp.c if (work->single) { work->single = 0; Index: linux/arch/sparc/kernel/nmi.c -=================================--- linux.orig/arch/sparc/kernel/nmi.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/nmi.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/nmi.c 2013-12-02 16:07:59.764356512 -0600 @@ -111,20 +111,20 @@ notrace __kprobes void perfctr_irq(int i pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable); @@ -185,10 +190,10 @@ Index: linux/arch/sparc/kernel/nmi.c + __this_cpu_write(nmi_touch, 0); touched = 1; } -- if (!touched && __get_cpu_var(last_irq_sum) = sum) { -+ if (!touched && __this_cpu_read(last_irq_sum) = sum) { +- if (!touched && __get_cpu_var(last_irq_sum) == sum) { ++ if (!touched && __this_cpu_read(last_irq_sum) == sum) { __this_cpu_inc(alert_counter); - if (__this_cpu_read(alert_counter) = 30 * nmi_hz) + if (__this_cpu_read(alert_counter) == 30 * nmi_hz) die_nmi("BUG: NMI Watchdog detected LOCKUP", regs, panic_on_timeout); } else { @@ -229,7 +234,8 @@ Index: linux/arch/sparc/kernel/nmi.c pcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable); Index: linux/arch/sparc/kernel/pci_sun4v.c -=================================--- linux.orig/arch/sparc/kernel/pci_sun4v.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/pci_sun4v.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/pci_sun4v.c 2013-12-02 16:07:59.764356512 -0600 @@ -48,7 +48,7 @@ static int iommu_batch_initialized; /* Interrupts must be disabled. */ @@ -247,7 +253,7 @@ Index: linux/arch/sparc/kernel/pci_sun4v.c - struct iommu_batch *p = &__get_cpu_var(iommu_batch); + struct iommu_batch *p = this_cpu_ptr(&iommu_batch); - if (p->entry + p->npages = entry) + if (p->entry + p->npages == entry) return; @@ -106,7 +106,7 @@ static inline void iommu_batch_new_entry /* Interrupts must be disabled. */ @@ -268,7 +274,8 @@ Index: linux/arch/sparc/kernel/pci_sun4v.c BUG_ON(p->npages >= PGLIST_NENTS); Index: linux/arch/sparc/kernel/perf_event.c -=================================--- linux.orig/arch/sparc/kernel/perf_event.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/perf_event.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/perf_event.c 2013-12-02 16:07:59.764356512 -0600 @@ -1013,7 +1013,7 @@ static void update_pcrs_for_enable(struc @@ -386,7 +393,8 @@ Index: linux/arch/sparc/kernel/perf_event.c /* If the PMU has the TOE IRQ enable bits, we need to do a * dummy write to the %pcr to clear the overflow bits and thus Index: linux/arch/sparc/kernel/sun4d_smp.c -=================================--- linux.orig/arch/sparc/kernel/sun4d_smp.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/sun4d_smp.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/sun4d_smp.c 2013-12-02 16:07:59.764356512 -0600 @@ -204,7 +204,7 @@ static void __init smp4d_ipi_init(void) @@ -398,7 +406,8 @@ Index: linux/arch/sparc/kernel/sun4d_smp.c if (work->single) { work->single = 0; Index: linux/arch/sparc/kernel/time_64.c -=================================--- linux.orig/arch/sparc/kernel/time_64.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/kernel/time_64.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/kernel/time_64.c 2013-12-02 16:07:59.764356512 -0600 @@ -766,7 +766,7 @@ void setup_sparc64_timer(void) : /* no outputs */ @@ -410,7 +419,8 @@ Index: linux/arch/sparc/kernel/time_64.c memcpy(sevt, &sparc64_clockevent, sizeof(*sevt)); sevt->cpumask = cpumask_of(smp_processor_id()); Index: linux/arch/sparc/mm/tlb.c -=================================--- linux.orig/arch/sparc/mm/tlb.c 2013-12-02 16:07:59.774356233 -0600 +=================================================================== +--- linux.orig/arch/sparc/mm/tlb.c 2013-12-02 16:07:59.774356233 -0600 +++ linux/arch/sparc/mm/tlb.c 2013-12-02 16:07:59.764356512 -0600 @@ -53,14 +53,14 @@ out: diff --git a/a/content_digest b/N1/content_digest index c89f0c7..d78089f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020140117151812.770437629@linux.com\0" "From\0Christoph Lameter <cl@linux.com>\0" "Subject\0[PATCH 34/41] sparc: Replace __get_cpu_var uses\0" - "Date\0Fri, 17 Jan 2014 15:18:46 +0000\0" + "Date\0Fri, 17 Jan 2014 09:18:46 -0600\0" "To\0Tejun Heo <tj@kernel.org>\0" "Cc\0akpm@linuxfoundation.org" rostedt@goodmis.org @@ -12,6 +12,7 @@ sparclinux@vger.kernel.org " David S. Miller <davem@davemloft.net>\0" "\00:1\0" + "fn\0this_sparc\0" "b\0" "__get_cpu_var() is used for multiple purposes in the kernel source. One of\n" "them is address calculation via the form &__get_cpu_var(x). This calculates\n" @@ -123,7 +124,8 @@ "Signed-off-by: Christoph Lameter <cl@linux.com>\n" "\n" "Index: linux/arch/sparc/include/asm/cpudata_32.h\n" - "=================================--- linux.orig/arch/sparc/include/asm/cpudata_32.h\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/include/asm/cpudata_32.h\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/include/asm/cpudata_32.h\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -26,6 +26,6 @@ typedef struct {\n" " \n" @@ -134,7 +136,8 @@ " \n" " #endif /* _SPARC_CPUDATA_H */\n" "Index: linux/arch/sparc/include/asm/cpudata_64.h\n" - "=================================--- linux.orig/arch/sparc/include/asm/cpudata_64.h\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/include/asm/cpudata_64.h\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/include/asm/cpudata_64.h\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -33,7 +33,7 @@ typedef struct {\n" " \n" @@ -146,7 +149,8 @@ " extern const struct seq_operations cpuinfo_op;\n" " \n" "Index: linux/arch/sparc/kernel/kprobes.c\n" - "=================================--- linux.orig/arch/sparc/kernel/kprobes.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/kprobes.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/kprobes.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -83,7 +83,7 @@ static void __kprobes save_previous_kpro\n" " \n" @@ -176,7 +180,8 @@ " \t\t\t\tgoto ss_probe;\n" " \t\t}\n" "Index: linux/arch/sparc/kernel/leon_smp.c\n" - "=================================--- linux.orig/arch/sparc/kernel/leon_smp.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/leon_smp.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/leon_smp.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -354,7 +354,7 @@ static void leon_ipi_resched(int cpu)\n" " \n" @@ -188,7 +193,8 @@ " \tif (work->single) {\n" " \t\twork->single = 0;\n" "Index: linux/arch/sparc/kernel/nmi.c\n" - "=================================--- linux.orig/arch/sparc/kernel/nmi.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/nmi.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/nmi.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -111,20 +111,20 @@ notrace __kprobes void perfctr_irq(int i\n" " \t\tpcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);\n" @@ -200,10 +206,10 @@ "+\t\t__this_cpu_write(nmi_touch, 0);\n" " \t\ttouched = 1;\n" " \t}\n" - "-\tif (!touched && __get_cpu_var(last_irq_sum) = sum) {\n" - "+\tif (!touched && __this_cpu_read(last_irq_sum) = sum) {\n" + "-\tif (!touched && __get_cpu_var(last_irq_sum) == sum) {\n" + "+\tif (!touched && __this_cpu_read(last_irq_sum) == sum) {\n" " \t\t__this_cpu_inc(alert_counter);\n" - " \t\tif (__this_cpu_read(alert_counter) = 30 * nmi_hz)\n" + " \t\tif (__this_cpu_read(alert_counter) == 30 * nmi_hz)\n" " \t\t\tdie_nmi(\"BUG: NMI Watchdog detected LOCKUP\",\n" " \t\t\t\tregs, panic_on_timeout);\n" " \t} else {\n" @@ -244,7 +250,8 @@ " \n" " \tpcr_ops->write_pcr(0, pcr_ops->pcr_nmi_disable);\n" "Index: linux/arch/sparc/kernel/pci_sun4v.c\n" - "=================================--- linux.orig/arch/sparc/kernel/pci_sun4v.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/pci_sun4v.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/pci_sun4v.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -48,7 +48,7 @@ static int iommu_batch_initialized;\n" " /* Interrupts must be disabled. */\n" @@ -262,7 +269,7 @@ "-\tstruct iommu_batch *p = &__get_cpu_var(iommu_batch);\n" "+\tstruct iommu_batch *p = this_cpu_ptr(&iommu_batch);\n" " \n" - " \tif (p->entry + p->npages = entry)\n" + " \tif (p->entry + p->npages == entry)\n" " \t\treturn;\n" "@@ -106,7 +106,7 @@ static inline void iommu_batch_new_entry\n" " /* Interrupts must be disabled. */\n" @@ -283,7 +290,8 @@ " \tBUG_ON(p->npages >= PGLIST_NENTS);\n" " \n" "Index: linux/arch/sparc/kernel/perf_event.c\n" - "=================================--- linux.orig/arch/sparc/kernel/perf_event.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/perf_event.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/perf_event.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -1013,7 +1013,7 @@ static void update_pcrs_for_enable(struc\n" " \n" @@ -401,7 +409,8 @@ " \t/* If the PMU has the TOE IRQ enable bits, we need to do a\n" " \t * dummy write to the %pcr to clear the overflow bits and thus\n" "Index: linux/arch/sparc/kernel/sun4d_smp.c\n" - "=================================--- linux.orig/arch/sparc/kernel/sun4d_smp.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/sun4d_smp.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/sun4d_smp.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -204,7 +204,7 @@ static void __init smp4d_ipi_init(void)\n" " \n" @@ -413,7 +422,8 @@ " \tif (work->single) {\n" " \t\twork->single = 0;\n" "Index: linux/arch/sparc/kernel/time_64.c\n" - "=================================--- linux.orig/arch/sparc/kernel/time_64.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/kernel/time_64.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/kernel/time_64.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -766,7 +766,7 @@ void setup_sparc64_timer(void)\n" " \t\t\t : /* no outputs */\n" @@ -425,7 +435,8 @@ " \tmemcpy(sevt, &sparc64_clockevent, sizeof(*sevt));\n" " \tsevt->cpumask = cpumask_of(smp_processor_id());\n" "Index: linux/arch/sparc/mm/tlb.c\n" - "=================================--- linux.orig/arch/sparc/mm/tlb.c\t2013-12-02 16:07:59.774356233 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sparc/mm/tlb.c\t2013-12-02 16:07:59.774356233 -0600\n" "+++ linux/arch/sparc/mm/tlb.c\t2013-12-02 16:07:59.764356512 -0600\n" "@@ -53,14 +53,14 @@ out:\n" " \n" @@ -445,4 +456,4 @@ " \tif (tb->tlb_nr)\n" " \t\tflush_tlb_pending();" -d57531003281caba52b996a8f504024f1de23edc45912af6d3a617f7e1b0dbac +35a42021e7c0502705d082f37136f9df1179487213715937144127a6c593768a
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.