From ac25f5c5cb54d10d57e190e54a308899d35dae2f Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Tue, 29 May 2012 21:27:59 +0200
Subject: [PATCH] --- yaml --- r: 312209 b: refs/heads/master c:
 a3d7bb47937b3a40b9f0c75655e97b3bb6407cbe h: refs/heads/master i:   312207:
 f33f94239e237939fa02fa17db7b1a39073f4e45 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 768ec33ab427..9f3b36b4f7a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c00b275043adc14d668f36266b890f0c53d46640
+refs/heads/master: a3d7bb47937b3a40b9f0c75655e97b3bb6407cbe
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index d0f5ec0dcdea..a0dbc87a2ec6 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -312,7 +312,7 @@ static int read_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_
 	void *vaddr_new;
 	int ret;
 
-	ret = get_user_pages(NULL, mm, vaddr, 1, 0, 0, &page, NULL);
+	ret = get_user_pages(NULL, mm, vaddr, 1, 0, 1, &page, NULL);
 	if (ret <= 0)
 		return ret;