diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-06-30 14:10:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:16:13 -0400 |
commit | 102d0a4b56d94e9b7eedfdfb488400271235543f (patch) | |
tree | 36f55db42899a7912c24fd6968ee4e610ec6c448 /arch | |
parent | 3ae960a598b9dfe87b29eb70738d91a13e692498 (diff) |
x86, paravirt, 64-bit: fix compile errors with IA32_EMULATION off
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/paravirt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 27819e3e4245..e7e5652f65bc 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -337,9 +337,13 @@ struct pv_cpu_ops pv_cpu_ops = { | |||
337 | .write_idt_entry = native_write_idt_entry, | 337 | .write_idt_entry = native_write_idt_entry, |
338 | .load_sp0 = native_load_sp0, | 338 | .load_sp0 = native_load_sp0, |
339 | 339 | ||
340 | #if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) | ||
340 | .irq_enable_sysexit = native_irq_enable_sysexit, | 341 | .irq_enable_sysexit = native_irq_enable_sysexit, |
342 | #endif | ||
341 | #ifdef CONFIG_X86_64 | 343 | #ifdef CONFIG_X86_64 |
344 | #ifdef CONFIG_IA32_EMULATION | ||
342 | .usergs_sysret32 = native_usergs_sysret32, | 345 | .usergs_sysret32 = native_usergs_sysret32, |
346 | #endif | ||
343 | .usergs_sysret64 = native_usergs_sysret64, | 347 | .usergs_sysret64 = native_usergs_sysret64, |
344 | #endif | 348 | #endif |
345 | .iret = native_iret, | 349 | .iret = native_iret, |