mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
perf/x86/intel: Fix unintended variable name reuse
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 Cc: <stable@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
9a6bc14350
commit
1b0dac2ac6
1 changed files with 8 additions and 8 deletions
|
@ -2428,7 +2428,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
|
||||||
static int __init uncore_type_init(struct intel_uncore_type *type)
|
static int __init uncore_type_init(struct intel_uncore_type *type)
|
||||||
{
|
{
|
||||||
struct intel_uncore_pmu *pmus;
|
struct intel_uncore_pmu *pmus;
|
||||||
struct attribute_group *events_group;
|
struct attribute_group *attr_group;
|
||||||
struct attribute **attrs;
|
struct attribute **attrs;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
|
@ -2455,19 +2455,19 @@ static int __init uncore_type_init(struct intel_uncore_type *type)
|
||||||
while (type->event_descs[i].attr.attr.name)
|
while (type->event_descs[i].attr.attr.name)
|
||||||
i++;
|
i++;
|
||||||
|
|
||||||
events_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
|
attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
|
||||||
sizeof(*events_group), GFP_KERNEL);
|
sizeof(*attr_group), GFP_KERNEL);
|
||||||
if (!events_group)
|
if (!attr_group)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
attrs = (struct attribute **)(events_group + 1);
|
attrs = (struct attribute **)(attr_group + 1);
|
||||||
events_group->name = "events";
|
attr_group->name = "events";
|
||||||
events_group->attrs = attrs;
|
attr_group->attrs = attrs;
|
||||||
|
|
||||||
for (j = 0; j < i; j++)
|
for (j = 0; j < i; j++)
|
||||||
attrs[j] = &type->event_descs[j].attr.attr;
|
attrs[j] = &type->event_descs[j].attr.attr;
|
||||||
|
|
||||||
type->events_group = events_group;
|
type->events_group = attr_group;
|
||||||
}
|
}
|
||||||
|
|
||||||
type->pmu_group = &uncore_pmu_attr_group;
|
type->pmu_group = &uncore_pmu_attr_group;
|
||||||
|
|
Loading…
Reference in a new issue