[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1354869459-10858-1-git-send-email-yangyongqiang01@baidu.com>
Date: Fri, 7 Dec 2012 16:37:39 +0800
From: Yongqiang Yang <xiaoqiangnk@...il.com>
To: linux-kernel@...r.kernel.org
Cc: yangyongqiang <yangyongqiang01@...du.com>
Subject: [PATCH] x86: fix a compile error 'a section type conflict'
From: yangyongqiang <yangyongqiang01@...du.com>
Fix a compile error - 'a section type conflict' by removing __initconst.
Signed-off-by: yangyongqiang <yangyongqiang01@...du.com>
---
arch/x86/kernel/cpu/perf_event_p6.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c
index 7d0270b..436e200 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 u64 p6_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
[PERF_COUNT_HW_CACHE_OP_MAX]
[PERF_COUNT_HW_CACHE_RESULT_MAX] =
--
1.7.9.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists