diff options
author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-02-19 12:05:00 -0800 |
---|---|---|
committer | Tony Luck <aegl@agluck-desktop.(none)> | 2009-02-19 12:05:00 -0800 |
commit | ec8148de85a73a3be397a59b6d8f4f32cf2dd254 (patch) | |
tree | 29c1410a746ece1b16b668676335efd96700098b /arch/ia64 | |
parent | 1d5b20f490f61f36a58e6ecf1713a49a43620666 (diff) | |
download | linux-3.10-ec8148de85a73a3be397a59b6d8f4f32cf2dd254.tar.gz linux-3.10-ec8148de85a73a3be397a59b6d8f4f32cf2dd254.tar.bz2 linux-3.10-ec8148de85a73a3be397a59b6d8f4f32cf2dd254.zip |
[IA64] xen_domu build fix
arch/ia64/xen/xen_pv_ops.c:156: error: xen_init_ops causes a section type conflict
arch/ia64/xen/xen_pv_ops.c:340: error: xen_iosapic_ops causes a section type conflict
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/xen/xen_pv_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/xen/xen_pv_ops.c b/arch/ia64/xen/xen_pv_ops.c index 04cd1235045..936cff3c96e 100644 --- a/arch/ia64/xen/xen_pv_ops.c +++ b/arch/ia64/xen/xen_pv_ops.c @@ -153,7 +153,7 @@ xen_post_smp_prepare_boot_cpu(void) xen_setup_vcpu_info_placement(); } -static const struct pv_init_ops xen_init_ops __initdata = { +static const struct pv_init_ops xen_init_ops __initconst = { .banner = xen_banner, .reserve_memory = xen_reserve_memory, @@ -337,7 +337,7 @@ xen_iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val) HYPERVISOR_physdev_op(PHYSDEVOP_apic_write, &apic_op); } -static const struct pv_iosapic_ops xen_iosapic_ops __initdata = { +static const struct pv_iosapic_ops xen_iosapic_ops __initconst = { .pcat_compat_init = xen_pcat_compat_init, .__get_irq_chip = xen_iosapic_get_irq_chip, |