diff for duplicates of <20140117151838.452953764@linux.com> diff --git a/a/1.txt b/N1/1.txt index d7bfb92..49387e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -107,7 +107,8 @@ CC: linux-sh@vger.kernel.org Signed-off-by: Christoph Lameter <cl@linux.com> Index: linux/arch/sh/kernel/hw_breakpoint.c -=================================--- linux.orig/arch/sh/kernel/hw_breakpoint.c 2013-12-02 16:08:01.534307329 -0600 +=================================================================== +--- linux.orig/arch/sh/kernel/hw_breakpoint.c 2013-12-02 16:08:01.534307329 -0600 +++ linux/arch/sh/kernel/hw_breakpoint.c 2013-12-02 16:08:01.524307605 -0600 @@ -52,7 +52,7 @@ int arch_install_hw_breakpoint(struct pe int i; @@ -125,10 +126,11 @@ Index: linux/arch/sh/kernel/hw_breakpoint.c - struct perf_event **slot = &__get_cpu_var(bp_per_reg[i]); + struct perf_event **slot = this_cpu_ptr(&bp_per_reg[i]); - if (*slot = bp) { + if (*slot == bp) { *slot = NULL; Index: linux/arch/sh/kernel/kprobes.c -=================================--- linux.orig/arch/sh/kernel/kprobes.c 2013-12-02 16:08:01.534307329 -0600 +=================================================================== +--- linux.orig/arch/sh/kernel/kprobes.c 2013-12-02 16:08:01.534307329 -0600 +++ linux/arch/sh/kernel/kprobes.c 2013-12-02 16:08:01.524307605 -0600 @@ -102,7 +102,7 @@ int __kprobes kprobe_handle_illslot(unsi @@ -239,7 +241,8 @@ Index: linux/arch/sh/kernel/kprobes.c p->break_handler(p, args->regs)) ret = NOTIFY_STOP; Index: linux/arch/sh/kernel/localtimer.c -=================================--- linux.orig/arch/sh/kernel/localtimer.c 2013-12-02 16:08:01.534307329 -0600 +=================================================================== +--- linux.orig/arch/sh/kernel/localtimer.c 2013-12-02 16:08:01.534307329 -0600 +++ linux/arch/sh/kernel/localtimer.c 2013-12-02 16:08:01.524307605 -0600 @@ -32,7 +32,7 @@ static DEFINE_PER_CPU(struct clock_event */ @@ -251,7 +254,8 @@ Index: linux/arch/sh/kernel/localtimer.c irq_enter(); clk->event_handler(clk); Index: linux/arch/sh/kernel/perf_event.c -=================================--- linux.orig/arch/sh/kernel/perf_event.c 2013-12-02 16:08:01.534307329 -0600 +=================================================================== +--- linux.orig/arch/sh/kernel/perf_event.c 2013-12-02 16:08:01.534307329 -0600 +++ linux/arch/sh/kernel/perf_event.c 2013-12-02 16:08:01.524307605 -0600 @@ -227,7 +227,7 @@ again: @@ -290,7 +294,8 @@ Index: linux/arch/sh/kernel/perf_event.c int idx = hwc->idx; int ret = -EAGAIN; Index: linux/arch/sh/kernel/smp.c -=================================--- linux.orig/arch/sh/kernel/smp.c 2013-12-02 16:08:01.534307329 -0600 +=================================================================== +--- linux.orig/arch/sh/kernel/smp.c 2013-12-02 16:08:01.534307329 -0600 +++ linux/arch/sh/kernel/smp.c 2013-12-02 16:08:01.524307605 -0600 @@ -111,7 +111,7 @@ void play_dead_common(void) irq_ctx_exit(raw_smp_processor_id()); diff --git a/a/content_digest b/N1/content_digest index 59499c3..de05864 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 39/41] sh: Replace __get_cpu_var uses\0" - "Date\0Fri, 17 Jan 2014 15:18:51 +0000\0" + "Date\0Fri, 17 Jan 2014 09:18:51 -0600\0" "To\0Tejun Heo <tj@kernel.org>\0" "Cc\0akpm@linuxfoundation.org" rostedt@goodmis.org @@ -12,6 +12,7 @@ Paul Mundt <lethal@linux-sh.org> " linux-sh@vger.kernel.org\0" "\00:1\0" + "fn\0this_sh\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" @@ -122,7 +123,8 @@ "Signed-off-by: Christoph Lameter <cl@linux.com>\n" "\n" "Index: linux/arch/sh/kernel/hw_breakpoint.c\n" - "=================================--- linux.orig/arch/sh/kernel/hw_breakpoint.c\t2013-12-02 16:08:01.534307329 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sh/kernel/hw_breakpoint.c\t2013-12-02 16:08:01.534307329 -0600\n" "+++ linux/arch/sh/kernel/hw_breakpoint.c\t2013-12-02 16:08:01.524307605 -0600\n" "@@ -52,7 +52,7 @@ int arch_install_hw_breakpoint(struct pe\n" " \tint i;\n" @@ -140,10 +142,11 @@ "-\t\tstruct perf_event **slot = &__get_cpu_var(bp_per_reg[i]);\n" "+\t\tstruct perf_event **slot = this_cpu_ptr(&bp_per_reg[i]);\n" " \n" - " \t\tif (*slot = bp) {\n" + " \t\tif (*slot == bp) {\n" " \t\t\t*slot = NULL;\n" "Index: linux/arch/sh/kernel/kprobes.c\n" - "=================================--- linux.orig/arch/sh/kernel/kprobes.c\t2013-12-02 16:08:01.534307329 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sh/kernel/kprobes.c\t2013-12-02 16:08:01.534307329 -0600\n" "+++ linux/arch/sh/kernel/kprobes.c\t2013-12-02 16:08:01.524307605 -0600\n" "@@ -102,7 +102,7 @@ int __kprobes kprobe_handle_illslot(unsi\n" " \n" @@ -254,7 +257,8 @@ " \t\t\t\t\t p->break_handler(p, args->regs))\n" " \t\t\t\t\t\tret = NOTIFY_STOP;\n" "Index: linux/arch/sh/kernel/localtimer.c\n" - "=================================--- linux.orig/arch/sh/kernel/localtimer.c\t2013-12-02 16:08:01.534307329 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sh/kernel/localtimer.c\t2013-12-02 16:08:01.534307329 -0600\n" "+++ linux/arch/sh/kernel/localtimer.c\t2013-12-02 16:08:01.524307605 -0600\n" "@@ -32,7 +32,7 @@ static DEFINE_PER_CPU(struct clock_event\n" " */\n" @@ -266,7 +270,8 @@ " \tirq_enter();\n" " \tclk->event_handler(clk);\n" "Index: linux/arch/sh/kernel/perf_event.c\n" - "=================================--- linux.orig/arch/sh/kernel/perf_event.c\t2013-12-02 16:08:01.534307329 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sh/kernel/perf_event.c\t2013-12-02 16:08:01.534307329 -0600\n" "+++ linux/arch/sh/kernel/perf_event.c\t2013-12-02 16:08:01.524307605 -0600\n" "@@ -227,7 +227,7 @@ again:\n" " \n" @@ -305,7 +310,8 @@ " \tint idx = hwc->idx;\n" " \tint ret = -EAGAIN;\n" "Index: linux/arch/sh/kernel/smp.c\n" - "=================================--- linux.orig/arch/sh/kernel/smp.c\t2013-12-02 16:08:01.534307329 -0600\n" + "===================================================================\n" + "--- linux.orig/arch/sh/kernel/smp.c\t2013-12-02 16:08:01.534307329 -0600\n" "+++ linux/arch/sh/kernel/smp.c\t2013-12-02 16:08:01.524307605 -0600\n" "@@ -111,7 +111,7 @@ void play_dead_common(void)\n" " \tirq_ctx_exit(raw_smp_processor_id());\n" @@ -316,4 +322,4 @@ " \tlocal_irq_disable();\n" } -f16296c74c9d8ce0716e0d1b18b332ddde920118959c135e59269b9954765b2c +7341d94055c0c9497ab0e946ba1693392e8643c101a53537f6035050b00c8372
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.