linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: yangyongqiang <yangyongqiang01@baidu.com>
Subject: [PATCH] x86: fix a compile error 'a section type conflict'
Date: Fri,  7 Dec 2012 16:37:39 +0800	[thread overview]
Message-ID: <1354869459-10858-1-git-send-email-yangyongqiang01@baidu.com> (raw)

From: yangyongqiang <yangyongqiang01@baidu.com>

Fix a compile error - 'a section type conflict' by removing __initconst.

Signed-off-by: yangyongqiang <yangyongqiang01@baidu.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


                 reply	other threads:[~2012-12-07  8:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1354869459-10858-1-git-send-email-yangyongqiang01@baidu.com \
    --to=xiaoqiangnk@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yangyongqiang01@baidu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).