src/patches/suse-2.6.27.31/patches.xen/xen3-patch-2.6.27.15-16

   1 From: Greg Kroah-Hartman <gregkh@suse.de>
   2 Subject: Linux 2.6.27.16
   3
   4 Upstream 2.6.27.16 release from kernel.org
   5
   6 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   7
   8 Automatically created from "patches.kernel.org/patch-2.6.27.15-16" by xen-port-patches.py
   9
  10 --- sle11-2009-02-16.orig/arch/x86/mm/fault-xen.c       2009-02-16 16:49:32.000000000 +0100
  11 +++ sle11-2009-02-16/arch/x86/mm/fault-xen.c    2009-02-16 17:02:46.000000000 +0100
  12 @@ -627,8 +627,6 @@ void __kprobes do_page_fault(struct pt_r
  13
  14         si_code = SEGV_MAPERR;
  15
  16 -       if (notify_page_fault(regs))
  17 -               return;
  18         if (unlikely(kmmio_fault(regs, address)))
  19                 return;
  20
  21 @@ -667,6 +665,9 @@ void __kprobes do_page_fault(struct pt_r
  22                 if (spurious_fault(address, error_code))
  23                         return;
  24
  25 +               /* kprobes don't want to hook the spurious faults. */
  26 +               if (notify_page_fault(regs))
  27 +                       return;
  28                 /*
  29                  * Don't take the mm semaphore here. If we fixup a prefetch
  30                  * fault we could otherwise deadlock.
  31 @@ -674,6 +675,9 @@ void __kprobes do_page_fault(struct pt_r
  32                 goto bad_area_nosemaphore;
  33         }
  34
  35 +       /* kprobes don't want to hook the spurious faults. */
  36 +       if (notify_page_fault(regs))
  37 +               return;
  38
  39  #ifdef CONFIG_X86_32
  40         /* It's safe to allow irq's after cr2 has been saved and the vmalloc