2013-04-21 03:43:43

by Andi Kleen

Subject: [PATCH] perf, x86: Fix some broken initconsts

From: Andi Kleen <[email protected]>

Signed-off-by: Andi Kleen <[email protected]>

diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/kernel/cpu/perf_event_knc.c
index 4b7731b..2cfe648 100644
--- a/arch/x86/kernel/cpu/perf_event_knc.c
+++ b/arch/x86/kernel/cpu/perf_event_knc.c
@@ -17,7 +17,7 @@ static const u64 knc_perfmon_event_map[] =
[PERF_COUNT_HW_BRANCH_MISSES] = 0x002b,
};

-static __initconst u64 knc_hw_cache_event_ids
+static __initconst const u64 knc_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
[PERF_COUNT_HW_CACHE_OP_MAX]
[PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -284,7 +284,7 @@ static struct attribute *intel_knc_formats_attr[] = {
NULL,
};

-static __initconst struct x86_pmu knc_pmu = {
+static __initconst const struct x86_pmu knc_pmu = {
.name = "knc",
.handle_irq = knc_pmu_handle_irq,
.disable_all = knc_pmu_disable_all,

2013-04-21 09:56:31

by Ingo Molnar

Subject: Re: [PATCH] perf, x86: Fix some broken initconsts

* Andi Kleen <[email protected]> wrote:

> From: Andi Kleen <[email protected]>
>
> Signed-off-by: Andi Kleen <[email protected]>
>
> diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/kernel/cpu/perf_event_knc.c
> index 4b7731b..2cfe648 100644
> --- a/arch/x86/kernel/cpu/perf_event_knc.c
> +++ b/arch/x86/kernel/cpu/perf_event_knc.c
> @@ -17,7 +17,7 @@ static const u64 knc_perfmon_event_map[] =
> [PERF_COUNT_HW_BRANCH_MISSES] = 0x002b,
> };
>
> -static __initconst u64 knc_hw_cache_event_ids
> +static __initconst const u64 knc_hw_cache_event_ids
> [PERF_COUNT_HW_CACHE_MAX]
> [PERF_COUNT_HW_CACHE_OP_MAX]
> [PERF_COUNT_HW_CACHE_RESULT_MAX] =
> @@ -284,7 +284,7 @@ static struct attribute *intel_knc_formats_attr[] = {
> NULL,
> };
>
> -static __initconst struct x86_pmu knc_pmu = {
> +static __initconst const struct x86_pmu knc_pmu = {
> .name = "knc",
> .handle_irq = knc_pmu_handle_irq,
> .disable_all = knc_pmu_disable_all,

Already fixed in:

c391c7884633 x86: Constify a few items

Thanks,

Ingo