x86/entry: Convert Overflow exception to IDTENTRY

[sfrench/cifs-2.6.git] / arch / x86 / xen / enlighten_pv.c

diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
index 507f4fb88fa7fd184d1bba278a9ebaa8c8039f37..25cf701f916b912cdcb3a110197cfc5ea4ed3c42 100644 (file)
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@ -63,7 +63,6 @@
 #include <asm/setup.h>
 #include <asm/desc.h>
 #include <asm/pgalloc.h>
-#include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/reboot.h>
 #include <asm/stackprotector.h>
@@ -605,6 +604,11 @@ struct trap_array_entry {
        bool ist_okay;
 };
 
+#define TRAP_ENTRY(func, ist_ok) {                     \
+       .orig           = asm_##func,                   \
+       .xen            = xen_asm_##func,               \
+       .ist_okay       = ist_ok }
+
 static struct trap_array_entry trap_array[] = {
        { debug,                       xen_xendebug,                    true },
        { double_fault,                xen_double_fault,                true },
@@ -613,12 +617,12 @@ static struct trap_array_entry trap_array[] = {
 #endif
        { nmi,                         xen_xennmi,                      true },
        { int3,                        xen_int3,                        false },
-       { overflow,                    xen_overflow,                    false },
+       TRAP_ENTRY(exc_overflow,                        false ),
 #ifdef CONFIG_IA32_EMULATION
        { entry_INT80_compat,          xen_entry_INT80_compat,          false },
 #endif
        { page_fault,                  xen_page_fault,                  false },
-       { divide_error,                xen_divide_error,                false },
+       TRAP_ENTRY(exc_divide_error,                    false ),
        { bounds,                      xen_bounds,                      false },
        { invalid_op,                  xen_invalid_op,                  false },
        { device_not_available,        xen_device_not_available,        false },