Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / mm / extable.c

diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
index 30bc4812ceb8a18796a9003f2bf8ae081c388a48..9fe656c42aa5b16560e139cebba247ca52756c80 100644 (file)
--- a/arch/x86/mm/extable.c
+++ b/arch/x86/mm/extable.c
@@ -1,6 +1,7 @@
 #include <linux/extable.h>
 #include <linux/uaccess.h>
 #include <linux/sched/debug.h>
 #include <linux/extable.h>
 #include <linux/uaccess.h>
 #include <linux/sched/debug.h>

+#include <xen/xen.h>

 
 #include <asm/fpu/internal.h>
 #include <asm/traps.h>
 
 #include <asm/fpu/internal.h>
 #include <asm/traps.h>


@@ -212,8 +213,9 @@ void __init early_fixup_exception(struct pt_regs *regs, int trapnr)
         * Old CPUs leave the high bits of CS on the stack
         * undefined.  I'm not sure which CPUs do this, but at least
         * the 486 DX works this way.
         * Old CPUs leave the high bits of CS on the stack
         * undefined.  I'm not sure which CPUs do this, but at least
         * the 486 DX works this way.

+        * Xen pv domains are not using the default __KERNEL_CS.

         */
         */

-       if (regs->cs != __KERNEL_CS)
+       if (!xen_pv_domain() && regs->cs != __KERNEL_CS)

                goto fail;
 
        /*
                goto fail;
 
        /*