diff for duplicates of <20140214201907.968656000@linux.com> diff --git a/a/1.txt b/N1/1.txt index fcf322a..432e86c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -109,7 +109,8 @@ Cc: linux-ia64@vger.kernel.org Signed-off-by: Christoph Lameter <cl@linux.com> Index: linux/arch/alpha/kernel/perf_event.c -=================================--- linux.orig/arch/alpha/kernel/perf_event.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/alpha/kernel/perf_event.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/alpha/kernel/perf_event.c 2014-01-20 16:21:25.561294390 -0600 @@ -814,7 +814,7 @@ struct hw_perf_event *hwc; @@ -121,7 +122,8 @@ Index: linux/arch/alpha/kernel/perf_event.c /* Completely counting through the PMC's period to trigger a new PMC Index: linux/arch/ia64/kernel/irq.c -=================================--- linux.orig/arch/ia64/kernel/irq.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/irq.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/irq.c 2014-01-20 16:21:25.561294390 -0600 @@ -42,7 +42,7 @@ @@ -133,7 +135,8 @@ Index: linux/arch/ia64/kernel/irq.c #endif Index: linux/arch/ia64/kernel/irq_ia64.c -=================================--- linux.orig/arch/ia64/kernel/irq_ia64.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/irq_ia64.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/irq_ia64.c 2014-01-20 16:21:25.561294390 -0600 @@ -338,7 +338,7 @@ int irq; @@ -154,7 +157,8 @@ Index: linux/arch/ia64/kernel/irq_ia64.c spin_unlock_irqrestore(&vector_lock, flags); cfg->move_cleanup_count--; Index: linux/arch/ia64/kernel/kprobes.c -=================================--- linux.orig/arch/ia64/kernel/kprobes.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/kprobes.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/kprobes.c 2014-01-20 16:21:25.561294390 -0600 @@ -396,7 +396,7 @@ { @@ -184,7 +188,8 @@ Index: linux/arch/ia64/kernel/kprobes.c goto ss_probe; } Index: linux/arch/ia64/kernel/mca.c -=================================--- linux.orig/arch/ia64/kernel/mca.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/mca.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/mca.c 2014-01-20 16:21:25.561294390 -0600 @@ -1341,7 +1341,7 @@ ia64_mlogbuf_finish(1); @@ -206,7 +211,8 @@ Index: linux/arch/ia64/kernel/mca.c * Stash away a copy of the PTE needed to map the per-CPU page. * We may need it during MCA recovery. */ -- __get_cpu_var(ia64_mca_per_cpu_pte) - pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL)); +- __get_cpu_var(ia64_mca_per_cpu_pte) = +- pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL)); + __this_cpu_write(ia64_mca_per_cpu_pte, + pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL))); @@ -216,7 +222,8 @@ Index: linux/arch/ia64/kernel/mca.c pal_vaddr = efi_get_pal_addr(); if (!pal_vaddr) return; -- __get_cpu_var(ia64_mca_pal_base) - GRANULEROUNDDOWN((unsigned long) pal_vaddr); +- __get_cpu_var(ia64_mca_pal_base) = +- GRANULEROUNDDOWN((unsigned long) pal_vaddr); - __get_cpu_var(ia64_mca_pal_pte) = pte_val(mk_pte_phys(__pa(pal_vaddr), - PAGE_KERNEL)); + __this_cpu_write(ia64_mca_pal_base, @@ -227,7 +234,8 @@ Index: linux/arch/ia64/kernel/mca.c static void ia64_mca_cmc_vector_adjust(void *dummy) Index: linux/arch/ia64/kernel/process.c -=================================--- linux.orig/arch/ia64/kernel/process.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/process.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/process.c 2014-01-20 16:21:25.561294390 -0600 @@ -215,7 +215,7 @@ unsigned int this_cpu = smp_processor_id(); @@ -257,7 +265,8 @@ Index: linux/arch/ia64/kernel/process.c pfm_syst_wide_update_task(task, info, 1); #endif Index: linux/arch/ia64/sn/kernel/sn2/sn2_smp.c -=================================--- linux.orig/arch/ia64/sn/kernel/sn2/sn2_smp.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/sn/kernel/sn2/sn2_smp.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/sn/kernel/sn2/sn2_smp.c 2014-01-20 16:21:25.561294390 -0600 @@ -134,8 +134,8 @@ itc = ia64_get_itc(); @@ -280,7 +289,7 @@ Index: linux/arch/ia64/sn/kernel/sn2/sn2_smp.c return; } - if (atomic_read(&mm->mm_users) = 1 && mymm) { + if (atomic_read(&mm->mm_users) == 1 && mymm) { flush_tlb_mm(mm); - __get_cpu_var(ptcstats).change_rid++; + __this_cpu_inc(ptcstats.change_rid); @@ -319,7 +328,7 @@ Index: linux/arch/ia64/sn/kernel/sn2/sn2_smp.c @@ -311,7 +311,7 @@ spin_unlock_irqrestore(PTC_LOCK(shub1), flags); - if (flush_opt = 1 && deadlock) { + if (flush_opt == 1 && deadlock) { - __get_cpu_var(ptcstats).deadlocks++; + __this_cpu_inc(ptcstats.deadlocks); sn2_ipi_flush_all_tlb(mm); @@ -344,7 +353,8 @@ Index: linux/arch/ia64/sn/kernel/sn2/sn2_smp.c } Index: linux/arch/ia64/include/asm/hw_irq.h -=================================--- linux.orig/arch/ia64/include/asm/hw_irq.h 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/include/asm/hw_irq.h 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/include/asm/hw_irq.h 2014-01-20 16:21:25.561294390 -0600 @@ -160,7 +160,7 @@ static inline unsigned int @@ -356,7 +366,8 @@ Index: linux/arch/ia64/include/asm/hw_irq.h #endif Index: linux/arch/ia64/include/asm/sn/nodepda.h -=================================--- linux.orig/arch/ia64/include/asm/sn/nodepda.h 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/include/asm/sn/nodepda.h 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/include/asm/sn/nodepda.h 2014-01-20 16:21:25.561294390 -0600 @@ -70,7 +70,7 @@ */ @@ -368,7 +379,8 @@ Index: linux/arch/ia64/include/asm/sn/nodepda.h /* Index: linux/arch/ia64/include/asm/switch_to.h -=================================--- linux.orig/arch/ia64/include/asm/switch_to.h 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/include/asm/switch_to.h 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/include/asm/switch_to.h 2014-01-20 16:21:25.561294390 -0600 @@ -32,7 +32,7 @@ @@ -380,7 +392,8 @@ Index: linux/arch/ia64/include/asm/switch_to.h # define PERFMON_IS_SYSWIDE() (0) #endif Index: linux/arch/ia64/include/asm/sn/arch.h -=================================--- linux.orig/arch/ia64/include/asm/sn/arch.h 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/include/asm/sn/arch.h 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/include/asm/sn/arch.h 2014-01-20 16:21:25.561294390 -0600 @@ -57,7 +57,7 @@ u16 nasid_bitmask; @@ -389,7 +402,7 @@ Index: linux/arch/ia64/include/asm/sn/arch.h -#define sn_hub_info (&__get_cpu_var(__sn_hub_info)) +#define sn_hub_info this_cpu_ptr(&__sn_hub_info) #define is_shub2() (sn_hub_info->shub2) - #define is_shub1() (sn_hub_info->shub2 = 0) + #define is_shub1() (sn_hub_info->shub2 == 0) @@ -72,7 +72,7 @@ * cpu. @@ -401,7 +414,8 @@ Index: linux/arch/ia64/include/asm/sn/arch.h extern u8 sn_partition_id; Index: linux/arch/ia64/include/asm/uv/uv_hub.h -=================================--- linux.orig/arch/ia64/include/asm/uv/uv_hub.h 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/include/asm/uv/uv_hub.h 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/include/asm/uv/uv_hub.h 2014-01-20 16:21:25.561294390 -0600 @@ -108,7 +108,7 @@ unsigned char n_val; @@ -413,7 +427,8 @@ Index: linux/arch/ia64/include/asm/uv/uv_hub.h /* Index: linux/arch/ia64/kernel/traps.c -=================================--- linux.orig/arch/ia64/kernel/traps.c 2014-01-20 16:21:25.571294202 -0600 +=================================================================== +--- linux.orig/arch/ia64/kernel/traps.c 2014-01-20 16:21:25.571294202 -0600 +++ linux/arch/ia64/kernel/traps.c 2014-01-20 16:21:25.561294390 -0600 @@ -299,7 +299,7 @@ diff --git a/a/content_digest b/N1/content_digest index 5345139..300d56b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020140214201841.826179349@linux.com\0" "From\0Christoph Lameter <cl@linux.com>\0" "Subject\0[PATCH 38/48] ia64: Replace __get_cpu_var uses\0" - "Date\0Fri, 14 Feb 2014 20:19:19 +0000\0" + "Date\0Fri, 14 Feb 2014 14:19:19 -0600\0" "To\0Tejun Heo <tj@kernel.org>\0" "Cc\0akpm@linuxfoundation.org" rostedt@goodmis.org @@ -13,6 +13,7 @@ Fenghua Yu <fenghua.yu@intel.com> " linux-ia64@vger.kernel.org\0" "\00:1\0" + "fn\0this_ia64\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" @@ -125,7 +126,8 @@ "Signed-off-by: Christoph Lameter <cl@linux.com>\n" "\n" "Index: linux/arch/alpha/kernel/perf_event.c\n" - "=================================--- linux.orig/arch/alpha/kernel/perf_event.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/alpha/kernel/perf_event.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/alpha/kernel/perf_event.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -814,7 +814,7 @@\n" " \tstruct hw_perf_event *hwc;\n" @@ -137,7 +139,8 @@ " \n" " \t/* Completely counting through the PMC's period to trigger a new PMC\n" "Index: linux/arch/ia64/kernel/irq.c\n" - "=================================--- linux.orig/arch/ia64/kernel/irq.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/irq.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/irq.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -42,7 +42,7 @@\n" " \n" @@ -149,7 +152,8 @@ " #endif\n" " \n" "Index: linux/arch/ia64/kernel/irq_ia64.c\n" - "=================================--- linux.orig/arch/ia64/kernel/irq_ia64.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/irq_ia64.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/irq_ia64.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -338,7 +338,7 @@\n" " \t\tint irq;\n" @@ -170,7 +174,8 @@ " \t\tspin_unlock_irqrestore(&vector_lock, flags);\n" " \t\tcfg->move_cleanup_count--;\n" "Index: linux/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux.orig/arch/ia64/kernel/kprobes.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/kprobes.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/kprobes.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -396,7 +396,7 @@\n" " {\n" @@ -200,7 +205,8 @@ " \t\t\t\tgoto ss_probe;\n" " \t\t\t}\n" "Index: linux/arch/ia64/kernel/mca.c\n" - "=================================--- linux.orig/arch/ia64/kernel/mca.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/mca.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/mca.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -1341,7 +1341,7 @@\n" " \t\tia64_mlogbuf_finish(1);\n" @@ -222,7 +228,8 @@ " \t * Stash away a copy of the PTE needed to map the per-CPU page.\n" " \t * We may need it during MCA recovery.\n" " \t */\n" - "-\t__get_cpu_var(ia64_mca_per_cpu_pte) -\t\tpte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL));\n" + "-\t__get_cpu_var(ia64_mca_per_cpu_pte) =\n" + "-\t\tpte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL));\n" "+\t__this_cpu_write(ia64_mca_per_cpu_pte,\n" "+\t\tpte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL)));\n" " \n" @@ -232,7 +239,8 @@ " \tpal_vaddr = efi_get_pal_addr();\n" " \tif (!pal_vaddr)\n" " \t\treturn;\n" - "-\t__get_cpu_var(ia64_mca_pal_base) -\t\tGRANULEROUNDDOWN((unsigned long) pal_vaddr);\n" + "-\t__get_cpu_var(ia64_mca_pal_base) =\n" + "-\t\tGRANULEROUNDDOWN((unsigned long) pal_vaddr);\n" "-\t__get_cpu_var(ia64_mca_pal_pte) = pte_val(mk_pte_phys(__pa(pal_vaddr),\n" "-\t\t\t\t\t\t\t PAGE_KERNEL));\n" "+\t__this_cpu_write(ia64_mca_pal_base,\n" @@ -243,7 +251,8 @@ " \n" " static void ia64_mca_cmc_vector_adjust(void *dummy)\n" "Index: linux/arch/ia64/kernel/process.c\n" - "=================================--- linux.orig/arch/ia64/kernel/process.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/process.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/process.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -215,7 +215,7 @@\n" " \tunsigned int this_cpu = smp_processor_id();\n" @@ -273,7 +282,8 @@ " \t\tpfm_syst_wide_update_task(task, info, 1);\n" " #endif\n" "Index: linux/arch/ia64/sn/kernel/sn2/sn2_smp.c\n" - "=================================--- linux.orig/arch/ia64/sn/kernel/sn2/sn2_smp.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/sn/kernel/sn2/sn2_smp.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/sn/kernel/sn2/sn2_smp.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -134,8 +134,8 @@\n" " \titc = ia64_get_itc();\n" @@ -296,7 +306,7 @@ " \t\treturn;\n" " \t}\n" " \n" - " \tif (atomic_read(&mm->mm_users) = 1 && mymm) {\n" + " \tif (atomic_read(&mm->mm_users) == 1 && mymm) {\n" " \t\tflush_tlb_mm(mm);\n" "-\t\t__get_cpu_var(ptcstats).change_rid++;\n" "+\t\t__this_cpu_inc(ptcstats.change_rid);\n" @@ -335,7 +345,7 @@ "@@ -311,7 +311,7 @@\n" " \tspin_unlock_irqrestore(PTC_LOCK(shub1), flags);\n" " \n" - " \tif (flush_opt = 1 && deadlock) {\n" + " \tif (flush_opt == 1 && deadlock) {\n" "-\t\t__get_cpu_var(ptcstats).deadlocks++;\n" "+\t\t__this_cpu_inc(ptcstats.deadlocks);\n" " \t\tsn2_ipi_flush_all_tlb(mm);\n" @@ -360,7 +370,8 @@ " \n" " }\n" "Index: linux/arch/ia64/include/asm/hw_irq.h\n" - "=================================--- linux.orig/arch/ia64/include/asm/hw_irq.h\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/include/asm/hw_irq.h\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/include/asm/hw_irq.h\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -160,7 +160,7 @@\n" " static inline unsigned int\n" @@ -372,7 +383,8 @@ " #endif\n" " \n" "Index: linux/arch/ia64/include/asm/sn/nodepda.h\n" - "=================================--- linux.orig/arch/ia64/include/asm/sn/nodepda.h\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/include/asm/sn/nodepda.h\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/include/asm/sn/nodepda.h\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -70,7 +70,7 @@\n" " */\n" @@ -384,7 +396,8 @@ " \n" " /*\n" "Index: linux/arch/ia64/include/asm/switch_to.h\n" - "=================================--- linux.orig/arch/ia64/include/asm/switch_to.h\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/include/asm/switch_to.h\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/include/asm/switch_to.h\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -32,7 +32,7 @@\n" " \n" @@ -396,7 +409,8 @@ " # define PERFMON_IS_SYSWIDE() (0)\n" " #endif\n" "Index: linux/arch/ia64/include/asm/sn/arch.h\n" - "=================================--- linux.orig/arch/ia64/include/asm/sn/arch.h\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/include/asm/sn/arch.h\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/include/asm/sn/arch.h\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -57,7 +57,7 @@\n" " \tu16 nasid_bitmask;\n" @@ -405,7 +419,7 @@ "-#define sn_hub_info \t(&__get_cpu_var(__sn_hub_info))\n" "+#define sn_hub_info \tthis_cpu_ptr(&__sn_hub_info)\n" " #define is_shub2()\t(sn_hub_info->shub2)\n" - " #define is_shub1()\t(sn_hub_info->shub2 = 0)\n" + " #define is_shub1()\t(sn_hub_info->shub2 == 0)\n" " \n" "@@ -72,7 +72,7 @@\n" " * cpu.\n" @@ -417,7 +431,8 @@ " \n" " extern u8 sn_partition_id;\n" "Index: linux/arch/ia64/include/asm/uv/uv_hub.h\n" - "=================================--- linux.orig/arch/ia64/include/asm/uv/uv_hub.h\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/include/asm/uv/uv_hub.h\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/include/asm/uv/uv_hub.h\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -108,7 +108,7 @@\n" " \tunsigned char\tn_val;\n" @@ -429,7 +444,8 @@ " \n" " /*\n" "Index: linux/arch/ia64/kernel/traps.c\n" - "=================================--- linux.orig/arch/ia64/kernel/traps.c\t2014-01-20 16:21:25.571294202 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/ia64/kernel/traps.c\t2014-01-20 16:21:25.571294202 -0600\n" "+++ linux/arch/ia64/kernel/traps.c\t2014-01-20 16:21:25.561294390 -0600\n" "@@ -299,7 +299,7 @@\n" " \n" @@ -441,4 +457,4 @@ " \t\tif (unlikely(current_jiffies > cp->time))\n" " \t\t\tcp->count = 0;" -fdfa1699a406627763ad275f2479ee7a4a26a71dc2affb92e6c55302ce27e0e4 +7756665f5b06175d0cf863e2979924d4656006a79a9369f86f291c052f8346bb
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.