Automatic merge with /usr/src/ntfs-2.6.git.

1 files changed, 5 insertions, 2 deletions

diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index a509237c4815..8e90339d6eaa 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -146,7 +146,7 @@ static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
 
                 if (instr > limit)
                         break;
-                if (__get_user(opcode, (unsigned char *) instr))
+                if (__get_user(opcode, (unsigned char __user *) instr))
                         break; 
 
                 instr_hi = opcode & 0xf0; 
@@ -173,7 +173,7 @@ static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
                         scan_more = 0;
                         if (instr > limit)
                                 break;
-                        if (__get_user(opcode, (unsigned char *) instr)) 
+                        if (__get_user(opcode, (unsigned char __user *) instr))
                                 break;
                         prefetch = (instr_lo == 0xF) &&
                                 (opcode == 0x0D || opcode == 0x18);
@@ -463,6 +463,9 @@ no_context:
                 printk(KERN_ALERT "*pte = %08lx\n", page);
         }
 #endif
+        tsk->thread.cr2 = address;
+        tsk->thread.trap_no = 14;
+        tsk->thread.error_code = error_code;
         die("Oops", regs, error_code);
         bust_spinlocks(0);
         do_exit(SIGKILL);