diff options
-rw-r--r-- | fs/proc/task_mmu.c | 4 | ||||
-rw-r--r-- | fs/proc/task_nommu.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b0ae0be4801f..39e4ad4f59f4 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -204,6 +204,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) | |||
204 | struct file *file = vma->vm_file; | 204 | struct file *file = vma->vm_file; |
205 | int flags = vma->vm_flags; | 205 | int flags = vma->vm_flags; |
206 | unsigned long ino = 0; | 206 | unsigned long ino = 0; |
207 | unsigned long long pgoff = 0; | ||
207 | dev_t dev = 0; | 208 | dev_t dev = 0; |
208 | int len; | 209 | int len; |
209 | 210 | ||
@@ -211,6 +212,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) | |||
211 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; | 212 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; |
212 | dev = inode->i_sb->s_dev; | 213 | dev = inode->i_sb->s_dev; |
213 | ino = inode->i_ino; | 214 | ino = inode->i_ino; |
215 | pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; | ||
214 | } | 216 | } |
215 | 217 | ||
216 | seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", | 218 | seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", |
@@ -220,7 +222,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) | |||
220 | flags & VM_WRITE ? 'w' : '-', | 222 | flags & VM_WRITE ? 'w' : '-', |
221 | flags & VM_EXEC ? 'x' : '-', | 223 | flags & VM_EXEC ? 'x' : '-', |
222 | flags & VM_MAYSHARE ? 's' : 'p', | 224 | flags & VM_MAYSHARE ? 's' : 'p', |
223 | ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, | 225 | pgoff, |
224 | MAJOR(dev), MINOR(dev), ino, &len); | 226 | MAJOR(dev), MINOR(dev), ino, &len); |
225 | 227 | ||
226 | /* | 228 | /* |
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 863464d5519c..12c20377772d 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c | |||
@@ -126,6 +126,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) | |||
126 | struct file *file; | 126 | struct file *file; |
127 | dev_t dev = 0; | 127 | dev_t dev = 0; |
128 | int flags, len; | 128 | int flags, len; |
129 | unsigned long long pgoff = 0; | ||
129 | 130 | ||
130 | flags = vma->vm_flags; | 131 | flags = vma->vm_flags; |
131 | file = vma->vm_file; | 132 | file = vma->vm_file; |
@@ -134,6 +135,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) | |||
134 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; | 135 | struct inode *inode = vma->vm_file->f_path.dentry->d_inode; |
135 | dev = inode->i_sb->s_dev; | 136 | dev = inode->i_sb->s_dev; |
136 | ino = inode->i_ino; | 137 | ino = inode->i_ino; |
138 | pgoff = (loff_t)vma->pg_off << PAGE_SHIFT; | ||
137 | } | 139 | } |
138 | 140 | ||
139 | seq_printf(m, | 141 | seq_printf(m, |
@@ -144,7 +146,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) | |||
144 | flags & VM_WRITE ? 'w' : '-', | 146 | flags & VM_WRITE ? 'w' : '-', |
145 | flags & VM_EXEC ? 'x' : '-', | 147 | flags & VM_EXEC ? 'x' : '-', |
146 | flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', | 148 | flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', |
147 | (unsigned long long) vma->vm_pgoff << PAGE_SHIFT, | 149 | pgoff, |
148 | MAJOR(dev), MINOR(dev), ino, &len); | 150 | MAJOR(dev), MINOR(dev), ino, &len); |
149 | 151 | ||
150 | if (file) { | 152 | if (file) { |