From abe6f305f994d74ac750dfd6776dcb82993dcf38 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 30 Jun 2008 11:10:53 -0700 Subject: [PATCH] --- yaml --- r: 99984 b: refs/heads/master c: 102d0a4b56d94e9b7eedfdfb488400271235543f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/paravirt.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dbaf05ad7651..0e5d169a6952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ae960a598b9dfe87b29eb70738d91a13e692498 +refs/heads/master: 102d0a4b56d94e9b7eedfdfb488400271235543f diff --git a/trunk/arch/x86/kernel/paravirt.c b/trunk/arch/x86/kernel/paravirt.c index 27819e3e4245..e7e5652f65bc 100644 --- a/trunk/arch/x86/kernel/paravirt.c +++ b/trunk/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,