From b9b74f0e2ba6ac500580ec1b9cd668723a246ed0 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Tue, 7 Apr 2009 21:21:43 -0700 Subject: [PATCH] --- yaml --- r: 142799 b: refs/heads/master c: 4c967291fc875a53de7126d256ad5e48f42a6521 h: refs/heads/master i: 142797: b69d9cc87f7978cf73e64fc146163022700e9ac5 142795: 297a5ac8970b2c532c4ac117d74c887847b69a7f 142791: a6dc75da3d3ede05b9d188dc9866289133f99611 142783: b74b921cf895f31cc8ad0a576d7030fc2960504f v: v3 --- [refs] | 2 +- trunk/fs/proc/task_nommu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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,