X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=kernel%2Fevents%2Fuprobes.c;h=bf9edd8d75be53ed233ce29d731af5fa6cdda145;hb=01be83eea08d6d9f9209843e2e084505fba4053f;hp=edd0c985a939bc6006c770d172c323c6e1c5af46;hpb=45ff510517f3b1354a3d9c273ad5e5e8d08312cb;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index edd0c98..bf9edd8 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -205,7 +205,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr,
 		try_to_free_swap(old_page);
 	page_vma_mapped_walk_done(&pvmw);
 
-	if (vma->vm_flags & VM_LOCKED)
+	if ((vma->vm_flags & VM_LOCKED) && !PageCompound(old_page))
 		munlock_vma_page(old_page);
 	put_page(old_page);
 
@@ -1823,7 +1823,7 @@ void uprobe_copy_process(struct task_struct *t, unsigned long flags)
 
 	t->utask->dup_xol_addr = area->vaddr;
 	init_task_work(&t->utask->dup_xol_work, dup_xol_work);
-	task_work_add(t, &t->utask->dup_xol_work, true);
+	task_work_add(t, &t->utask->dup_xol_work, TWA_RESUME);
 }
 
 /*