From: Jeremy Fitzhardinge Date: Mon, 30 Jun 2008 18:10:53 +0000 (-0700) Subject: x86, paravirt, 64-bit: fix compile errors with IA32_EMULATION off X-Git-Tag: v2.6.27-rc1~1106^2~102 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=102d0a4b56d94e9b7eedfdfb488400271235543f;p=linux-2.6-omap-h63xx.git x86, paravirt, 64-bit: fix compile errors with IA32_EMULATION off Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 27819e3e424..e7e5652f65b 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -337,9 +337,13 @@ struct pv_cpu_ops pv_cpu_ops = { .write_idt_entry = native_write_idt_entry, .load_sp0 = native_load_sp0, +#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) .irq_enable_sysexit = native_irq_enable_sysexit, +#endif #ifdef CONFIG_X86_64 +#ifdef CONFIG_IA32_EMULATION .usergs_sysret32 = native_usergs_sysret32, +#endif .usergs_sysret64 = native_usergs_sysret64, #endif .iret = native_iret,