From: Erez Zadok Date: Sun, 24 Nov 2013 18:08:19 +0000 (-0500) Subject: Unionfs: port to 3.7 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=10d35bef25c144f4834f0b34cc10d70e8f899991;p=unionfs-3.7.y.git Unionfs: port to 3.7 Signed-off-by: Erez Zadok --- diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c index 7d0270bd793..c3e0bdea5a8 100644 --- a/arch/x86/kernel/cpu/perf_event_p6.c +++ b/arch/x86/kernel/cpu/perf_event_p6.c @@ -19,7 +19,7 @@ static const u64 p6_perfmon_event_map[] = }; -static __initconst u64 p6_hw_cache_event_ids +static const u64 __initconst p6_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX] [PERF_COUNT_HW_CACHE_OP_MAX] [PERF_COUNT_HW_CACHE_RESULT_MAX] =