From eea312b7c941a81741051f7fe6c01a9390c063d7 Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Sat, 25 Jun 2005 14:58:46 -0700 Subject: [PATCH] --- yaml --- r: 3374 b: refs/heads/master c: c7c5844526f55b93fc9a44170cb7568c9bc95c4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/fault.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d87bf877a7d1..eba53259cf34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77617bd8068470556049ebcdd0625acc7ab71a2b +refs/heads/master: c7c5844526f55b93fc9a44170cb7568c9bc95c4a diff --git a/trunk/arch/i386/mm/fault.c b/trunk/arch/i386/mm/fault.c index 92ed6c0a55da..8e90339d6eaa 100644 --- a/trunk/arch/i386/mm/fault.c +++ b/trunk/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);