diff --git a/[refs] b/[refs] index e3501e2c2ae0..ca69922a30f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 508dc4f8eece1a70c493afc6511fdf5934fef567 +refs/heads/master: 61e1d394984110e2e76f25572d5b1b5d48796751 diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index c08a22d02f72..7cff24c60dd7 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/kernel/events/uprobes.c @@ -280,12 +280,10 @@ static int read_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_ if (ret <= 0) return ret; - lock_page(page); vaddr_new = kmap_atomic(page); vaddr &= ~PAGE_MASK; memcpy(opcode, vaddr_new + vaddr, UPROBE_SWBP_INSN_SIZE); kunmap_atomic(vaddr_new); - unlock_page(page); put_page(page);