diff options
author | Jan-Simon Möller | 2013-04-30 05:02:33 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-05-11 15:53:51 -0500 |
commit | 5eac4db22f37a4048b22fb963e2907db5b87dbd5 (patch) | |
tree | 8256d6eb6bc6e1d848bff65f6824af0720148f78 /arch | |
parent | aab55611aa0e243b360b14d25416b52095238965 (diff) | |
download | kernel-omap-5eac4db22f37a4048b22fb963e2907db5b87dbd5.tar.gz kernel-omap-5eac4db22f37a4048b22fb963e2907db5b87dbd5.tar.xz kernel-omap-5eac4db22f37a4048b22fb963e2907db5b87dbd5.zip |
perf/x86/intel: Fix unintended variable name reuse
commit 1b0dac2ac6debdbf1541e15f2cede03613cf4465 upstream.
The variable name events_group is already in used and led to a
compilation error when using clang to build the Linux Kernel .
The fix is just to rename the var. No functional change. Please
apply.
Fix suggested in discussion by PaX Team <pageexec@freemail.hu>
Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
Cc: rostedt@goodmis.org
Cc: a.p.zijlstra@chello.nl
Cc: paulus@samba.org
Cc: acme@ghostprotocols.net
Link: http://lkml.kernel.org/r/1367316153-14808-1-git-send-email-dl9pf@gmx.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index 7756c6932725..3e091f04487c 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c | |||
@@ -2428,7 +2428,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types) | |||
2428 | static int __init uncore_type_init(struct intel_uncore_type *type) | 2428 | static int __init uncore_type_init(struct intel_uncore_type *type) |
2429 | { | 2429 | { |
2430 | struct intel_uncore_pmu *pmus; | 2430 | struct intel_uncore_pmu *pmus; |
2431 | struct attribute_group *events_group; | 2431 | struct attribute_group *attr_group; |
2432 | struct attribute **attrs; | 2432 | struct attribute **attrs; |
2433 | int i, j; | 2433 | int i, j; |
2434 | 2434 | ||
@@ -2455,19 +2455,19 @@ static int __init uncore_type_init(struct intel_uncore_type *type) | |||
2455 | while (type->event_descs[i].attr.attr.name) | 2455 | while (type->event_descs[i].attr.attr.name) |
2456 | i++; | 2456 | i++; |
2457 | 2457 | ||
2458 | events_group = kzalloc(sizeof(struct attribute *) * (i + 1) + | 2458 | attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) + |
2459 | sizeof(*events_group), GFP_KERNEL); | 2459 | sizeof(*attr_group), GFP_KERNEL); |
2460 | if (!events_group) | 2460 | if (!attr_group) |
2461 | goto fail; | 2461 | goto fail; |
2462 | 2462 | ||
2463 | attrs = (struct attribute **)(events_group + 1); | 2463 | attrs = (struct attribute **)(attr_group + 1); |
2464 | events_group->name = "events"; | 2464 | attr_group->name = "events"; |
2465 | events_group->attrs = attrs; | 2465 | attr_group->attrs = attrs; |
2466 | 2466 | ||
2467 | for (j = 0; j < i; j++) | 2467 | for (j = 0; j < i; j++) |
2468 | attrs[j] = &type->event_descs[j].attr.attr; | 2468 | attrs[j] = &type->event_descs[j].attr.attr; |
2469 | 2469 | ||
2470 | type->events_group = events_group; | 2470 | type->events_group = attr_group; |
2471 | } | 2471 | } |
2472 | 2472 | ||
2473 | type->pmu_group = &uncore_pmu_attr_group; | 2473 | type->pmu_group = &uncore_pmu_attr_group; |