From ee0932af752151d97f4cacbdd196d939dd766eed Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Sun, 29 Jul 2012 20:22:33 +0200 Subject: [PATCH] --- yaml --- r: 320474 b: refs/heads/master c: aefd8933d445abf7ff0d4027c624737898827bcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/events/uprobes.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6483c7ca4245..7e352a3c9d1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fd611a991391a6050cbd139201a2e12fc306540 +refs/heads/master: aefd8933d445abf7ff0d4027c624737898827bcd diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index 9db9cdf8ff34..fb961d5e205c 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/kernel/events/uprobes.c @@ -117,7 +117,7 @@ static loff_t vma_address(struct vm_area_struct *vma, loff_t offset) loff_t vaddr; vaddr = vma->vm_start + offset; - vaddr -= vma->vm_pgoff << PAGE_SHIFT; + vaddr -= (loff_t)vma->vm_pgoff << PAGE_SHIFT; return vaddr; } @@ -1450,7 +1450,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) inode = vma->vm_file->f_mapping->host; offset = bp_vaddr - vma->vm_start; - offset += (vma->vm_pgoff << PAGE_SHIFT); + offset += (loff_t)vma->vm_pgoff << PAGE_SHIFT; uprobe = find_uprobe(inode, offset); }