Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index 57d3ab15a5c7..2f187986f940 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -74,7 +74,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
         instr = (unsigned char *)convert_rip_to_linear(current, regs);
         max_instr = instr + 15;
 
-        if ((regs->cs & 3) != 0 && instr >= (unsigned char *)TASK_SIZE)
+        if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE)
                 return 0;
 
         while (scan_more && instr < max_instr) { 
@@ -106,7 +106,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
                         /* Could check the LDT for lm, but for now it's good
                            enough to assume that long mode only uses well known
                            segments or kernel. */
-                        scan_more = ((regs->cs & 3) == 0) || (regs->cs == __USER_CS);
+                        scan_more = (!user_mode(regs)) || (regs->cs == __USER_CS);
                         break;
                         
                 case 0x60: