From 3ba4191f6af0242f41b9c9f73b46b428aed1299a Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 6 Jun 2011 15:47:14 +0100
Subject: [PATCH] --- yaml --- r: 253170 b: refs/heads/master c:
 db1c9dfa649f9bd8dc11415fbfe5cfe1e24c5b33 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/mn10300/kernel/traps.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7fc306b3d493..bc3bce7f4ee2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e65d1f6eecc176ba1341541b5f41edd7eb4346a
+refs/heads/master: db1c9dfa649f9bd8dc11415fbfe5cfe1e24c5b33
diff --git a/trunk/arch/mn10300/kernel/traps.c b/trunk/arch/mn10300/kernel/traps.c
index f03cb278828f..bd3e5e73826e 100644
--- a/trunk/arch/mn10300/kernel/traps.c
+++ b/trunk/arch/mn10300/kernel/traps.c
@@ -28,7 +28,7 @@
 #include <linux/irq.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -156,7 +156,7 @@ int die_if_no_fixup(const char *str, struct pt_regs *regs,
 
 	case EXCEP_TRAP:
 	case EXCEP_UNIMPINS:
-		if (get_user(opcode, (uint8_t __user *)regs->pc) != 0)
+		if (probe_kernel_read(&opcode, (u8 *)regs->pc, 1) < 0)
 			break;
 		if (opcode == 0xff) {
 			if (notify_die(DIE_BREAKPOINT, str, regs, code, 0, 0))