From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756034Ab2HRRbW (ORCPT ); Sat, 18 Aug 2012 13:31:22 -0400 Received: from mga11.intel.com ([192.55.52.93]:9940 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751673Ab2HRRa0 (ORCPT ); Sat, 18 Aug 2012 13:30:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,791,1336374000"; d="scan'208";a="210330062" From: Andi Kleen To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, James.Bottomley@HansenPartnership.com, Andi Kleen Subject: [PATCH 05/31] sections: Fix section conflicts in arch/ia64 Date: Sat, 18 Aug 2012 10:29:56 -0700 Message-Id: <1345311022-26328-6-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1345311022-26328-1-git-send-email-andi@firstfloor.org> References: <1345311022-26328-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Signed-off-by: Andi Kleen --- arch/ia64/xen/irq_xen.c | 2 +- arch/ia64/xen/irq_xen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c index 3bb1223..01f479e 100644 --- a/arch/ia64/xen/irq_xen.c +++ b/arch/ia64/xen/irq_xen.c @@ -433,7 +433,7 @@ xen_resend_irq(unsigned int vector) (void)resend_irq_on_evtchn(vector); } -const struct pv_irq_ops xen_irq_ops __initdata = { +const struct pv_irq_ops xen_irq_ops __initconst = { .register_ipi = xen_register_ipi, .assign_irq_vector = xen_assign_irq_vector, diff --git a/arch/ia64/xen/irq_xen.h b/arch/ia64/xen/irq_xen.h index 26110f3..1778517 100644 --- a/arch/ia64/xen/irq_xen.h +++ b/arch/ia64/xen/irq_xen.h @@ -27,7 +27,7 @@ extern void (*late_time_init)(void); extern char xen_event_callback; void __init xen_init_IRQ(void); -extern const struct pv_irq_ops xen_irq_ops __initdata; +extern const struct pv_irq_ops xen_irq_ops __initconst; extern void xen_smp_intr_init(void); extern void xen_send_ipi(int cpu, int vec); -- 1.7.7.6