diff for duplicates of <20100831110152.GD22783@erda.amd.com> diff --git a/a/1.txt b/N1/1.txt index 7ef91a7..f6fddf8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -49,3 +49,37 @@ Thanks Will, -Robert -- + +>From 4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb Mon Sep 17 00:00:00 2001 +From: Robert Richter <robert.richter@amd.com> +Date: Mon, 30 Aug 2010 18:21:55 +0200 +Subject: [PATCH] oprofile, arm: initialize perf_event pointers with NULL + +The pointers must be NULL'ed to avoid double-freeing the pointers in +rare cases during reinitialization. + +Signed-off-by: Robert Richter <robert.richter@amd.com> +--- + arch/arm/oprofile/common.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c +index c3652f7..d660cb8 100644 +--- a/arch/arm/oprofile/common.c ++++ b/arch/arm/oprofile/common.c +@@ -351,6 +351,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) + { + int cpu, ret = 0; + ++ memset(&perf_events, 0, sizeof(perf_events)); ++ + perf_num_counters = armpmu_get_max_events(); + + counter_config = kcalloc(perf_num_counters, +-- +1.7.1.1 + + +-- +Advanced Micro Devices, Inc. +Operating System Research Center diff --git a/a/content_digest b/N1/content_digest index 7b04d13..30541c1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01283107921-21464-1-git-send-email-will.deacon@arm.com\0" - "From\0robert.richter@amd.com (Robert Richter)\0" - "Subject\0[PATCH 0/3] stop OProfile calling arch_exit when arch_init fails\0" + "From\0Robert Richter <robert.richter@amd.com>\0" + "Subject\0Re: [PATCH 0/3] stop OProfile calling arch_exit when arch_init fails\0" "Date\0Tue, 31 Aug 2010 13:01:52 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Will Deacon <will.deacon@arm.com>\0" + "Cc\0linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>" + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + Matt Fleming <matt@console-pimps.org> + Peter Zijlstra <peterz@infradead.org> + " Ingo Molnar <mingo@elte.hu>\0" "\00:1\0" "b\0" "On 29.08.10 14:51:58, Will Deacon wrote:\n" @@ -55,6 +60,40 @@ "\n" "-Robert\n" "\n" - -- + "--\n" + "\n" + ">From 4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb Mon Sep 17 00:00:00 2001\n" + "From: Robert Richter <robert.richter@amd.com>\n" + "Date: Mon, 30 Aug 2010 18:21:55 +0200\n" + "Subject: [PATCH] oprofile, arm: initialize perf_event pointers with NULL\n" + "\n" + "The pointers must be NULL'ed to avoid double-freeing the pointers in\n" + "rare cases during reinitialization.\n" + "\n" + "Signed-off-by: Robert Richter <robert.richter@amd.com>\n" + "---\n" + " arch/arm/oprofile/common.c | 2 ++\n" + " 1 files changed, 2 insertions(+), 0 deletions(-)\n" + "\n" + "diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c\n" + "index c3652f7..d660cb8 100644\n" + "--- a/arch/arm/oprofile/common.c\n" + "+++ b/arch/arm/oprofile/common.c\n" + "@@ -351,6 +351,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)\n" + " {\n" + " \tint cpu, ret = 0;\n" + " \n" + "+\tmemset(&perf_events, 0, sizeof(perf_events));\n" + "+\n" + " \tperf_num_counters = armpmu_get_max_events();\n" + " \n" + " \tcounter_config = kcalloc(perf_num_counters,\n" + "-- \n" + "1.7.1.1\n" + "\n" + "\n" + "-- \n" + "Advanced Micro Devices, Inc.\n" + Operating System Research Center -8186a2453df45e3e23187c6b125e15920b595b81509b76806d5f8fe849a8ac40 +974aed5e2601c1eb47488db302c3a85ac3307e9ec03949dfefe5cbc3da589c01
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.