diff --git a/[refs] b/[refs] index 712586350b37..bb3cdba65884 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 628ada0cb03666dd463f7c25947eaccdf440c309 +refs/heads/master: 3a0304e90aa5a2c0c308a05d28f7d109a48d8539 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 087025fe3ba1..5a69abb05ac3 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -3749,7 +3749,7 @@ void __perf_event_mmap(struct vm_area_struct *vma) /* .tid */ .start = vma->vm_start, .len = vma->vm_end - vma->vm_start, - .pgoff = vma->vm_pgoff, + .pgoff = (u64)vma->vm_pgoff << PAGE_SHIFT, }, };