[PATCH] [TRIVIAL] FIX: unintended variable name reuse

[PATCH] [TRIVIAL] FIX: unintended variable name reuse

[Jan-Simon Möller]

Cleanup a variable name reuse. 


Fix suggested by PaX Team <pageexec@freemail.hu>
Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
 1 file 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 b43200d..4c783be 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)
 static int __init uncore_type_init(struct intel_uncore_type *type)
 {
 	struct intel_uncore_pmu *pmus;
-	struct attribute_group *events_group;
+	struct attribute_group *attr_group;
 	struct attribute **attrs;
 	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)
 			i++;
 
-		events_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
-					sizeof(*events_group), GFP_KERNEL);
-		if (!events_group)
+		attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
+					sizeof(*attr_group), GFP_KERNEL);
+		if (!attr_group)
 			goto fail;
 
-		attrs = (struct attribute **)(events_group + 1);
-		events_group->name = "events";
-		events_group->attrs = attrs;
+		attrs = (struct attribute **)(attr_group + 1);
+		attr_group->name = "events";
+		attr_group->attrs = attrs;
 
 		for (j = 0; j < i; j++)
 			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;
-- 
1.8.1.4

Re: [PATCH] [TRIVIAL] FIX: unintended variable name reuse

[PaX Team]

On 5 Apr 2013 at 18:17, Jan-Simon Möller wrote:

> Cleanup a variable name reuse. 
> 
> 
> Fix suggested by PaX Team <pageexec@freemail.hu>

Reviewed-by: PaX Team <pageexec@freemail.hu>

> Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
> ---
>  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)

[PATCH] [TRIVIAL] FIX: unintended variable name reuse

[dl9pf]

From: Jan-Simon Möller <dl9pf@gmx.de>

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: tglx@linutronix.de
CC: hpa@zytor.com
CC: rostedt@goodmis.org
CC: a.p.zijlstra@chello.nl
CC: paulus@samba.org
CC: mingo@redhat.com
CC: acme@ghostprotocols.net
CC: x86@kernel.org
CC: linux-kernel@vger.kernel.org
---
 arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
 1 file 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 d0f9e5a..c01d159 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -3093,7 +3093,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
 static int __init uncore_type_init(struct intel_uncore_type *type)
 {
 	struct intel_uncore_pmu *pmus;
-	struct attribute_group *events_group;
+	struct attribute_group *attr_group;
 	struct attribute **attrs;
 	int i, j;
 
@@ -3120,19 +3120,19 @@ static int __init uncore_type_init(struct intel_uncore_type *type)
 		while (type->event_descs[i].attr.attr.name)
 			i++;
 
-		events_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
-					sizeof(*events_group), GFP_KERNEL);
-		if (!events_group)
+		attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
+					sizeof(*attr_group), GFP_KERNEL);
+		if (!attr_group)
 			goto fail;
 
-		attrs = (struct attribute **)(events_group + 1);
-		events_group->name = "events";
-		events_group->attrs = attrs;
+		attrs = (struct attribute **)(attr_group + 1);
+		attr_group->name = "events";
+		attr_group->attrs = attrs;
 
 		for (j = 0; j < i; j++)
 			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;
-- 
1.8.1.4

Re: [PATCH] [TRIVIAL] FIX: unintended variable name reuse

[Steven Rostedt]

On Tue, 2013-04-30 at 12:02 +0200, dl9pf@gmx.de wrote:
> From: Jan-Simon Möller <dl9pf@gmx.de>
> 
> 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.

Need to be a little more specific on the problem in the change log. I'm
guessing that the issue is with the events_group define in
perf_event_intel_uncore.h:

#define events_group attr_groups[2]

I can see that causing issues with something like:

	struct attribute_group *events_group;

I don't think we really want that to end up being:

	struct attribute_group *attr_groups[2];

I'm surprised gcc allowed that :-/

Acked-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve

> 
> Fix suggested in discussion by PaX Team <pageexec@freemail.hu>
> Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
> 
> CC: tglx@linutronix.de
> CC: hpa@zytor.com
> CC: rostedt@goodmis.org
> CC: a.p.zijlstra@chello.nl
> CC: paulus@samba.org
> CC: mingo@redhat.com
> CC: acme@ghostprotocols.net
> CC: x86@kernel.org
> CC: linux-kernel@vger.kernel.org
> ---
>  arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
>  1 file 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 d0f9e5a..c01d159 100644
> --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
> @@ -3093,7 +3093,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
>  static int __init uncore_type_init(struct intel_uncore_type *type)
>  {
>  	struct intel_uncore_pmu *pmus;
> -	struct attribute_group *events_group;
> +	struct attribute_group *attr_group;
>  	struct attribute **attrs;
>  	int i, j;
>  
> @@ -3120,19 +3120,19 @@ static int __init uncore_type_init(struct intel_uncore_type *type)
>  		while (type->event_descs[i].attr.attr.name)
>  			i++;
>  
> -		events_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
> -					sizeof(*events_group), GFP_KERNEL);
> -		if (!events_group)
> +		attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
> +					sizeof(*attr_group), GFP_KERNEL);
> +		if (!attr_group)
>  			goto fail;
>  
> -		attrs = (struct attribute **)(events_group + 1);
> -		events_group->name = "events";
> -		events_group->attrs = attrs;
> +		attrs = (struct attribute **)(attr_group + 1);
> +		attr_group->name = "events";
> +		attr_group->attrs = attrs;
>  
>  		for (j = 0; j < i; j++)
>  			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;