aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/uprobes.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 2db1d94d7df..14c71a2aada 100644
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -211,7 +211,6 @@ static int write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,
211 struct vm_area_struct *vma; 211 struct vm_area_struct *vma;
212 struct uprobe *uprobe; 212 struct uprobe *uprobe;
213 unsigned long pgoff; 213 unsigned long pgoff;
214 loff_t addr;
215 int ret; 214 int ret;
216retry: 215retry:
217 /* Read the page with vaddr into memory */ 216 /* Read the page with vaddr into memory */
@@ -235,10 +234,6 @@ retry:
235 if (mapping != vma->vm_file->f_mapping) 234 if (mapping != vma->vm_file->f_mapping)
236 goto put_out; 235 goto put_out;
237 236
238 addr = vma_address(vma, uprobe->offset);
239 if (vaddr != (unsigned long)addr)
240 goto put_out;
241
242 ret = -ENOMEM; 237 ret = -ENOMEM;
243 new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vaddr); 238 new_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vaddr);
244 if (!new_page) 239 if (!new_page)