diff --git a/[refs] b/[refs] index 9586049fd49a..7a930b9a25b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b3fffefea993a94c386b2d96de2d09469c343d1 +refs/heads/master: 4c967291fc875a53de7126d256ad5e48f42a6521 diff --git a/trunk/fs/proc/task_nommu.c b/trunk/fs/proc/task_nommu.c index 12c20377772d..64a72e2e7650 100644 --- a/trunk/fs/proc/task_nommu.c +++ b/trunk/fs/proc/task_nommu.c @@ -135,7 +135,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) struct inode *inode = vma->vm_file->f_path.dentry->d_inode; dev = inode->i_sb->s_dev; ino = inode->i_ino; - pgoff = (loff_t)vma->pg_off << PAGE_SHIFT; + pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; } seq_printf(m,