projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/urgent' into core/entry
[platform/kernel/linux-rpi.git]
/
kernel
/
events
/
uprobes.c
diff --git
a/kernel/events/uprobes.c
b/kernel/events/uprobes.c
index
edd0c98
..
bf9edd8
100644
(file)
--- 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);
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);
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);
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
);
}
/*
}
/*