git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge head 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
[pandora-kernel.git]
/
arch
/
x86_64
/
mm
/
fault.c
diff --git
a/arch/x86_64/mm/fault.c
b/arch/x86_64/mm/fault.c
index
57d3ab1
..
1379272
100644
(file)
--- a/
arch/x86_64/mm/fault.c
+++ b/
arch/x86_64/mm/fault.c
@@
-23,7
+23,6
@@
#include <linux/vt_kern.h> /* For unblank_screen() */
#include <linux/compiler.h>
#include <linux/module.h>
#include <linux/vt_kern.h> /* For unblank_screen() */
#include <linux/compiler.h>
#include <linux/module.h>
-#include <linux/kprobes.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@
-74,7
+73,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;
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) {
return 0;
while (scan_more && instr < max_instr) {
@@
-106,7
+105,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. */
/* 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:
break;
case 0x60: