diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dcache.c | 2 | ||||
| -rw-r--r-- | fs/proc/task_mmu.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 166d35d5686..4d13bf50b7b 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1976,7 +1976,7 @@ global_root: * __d_path - return the path of a dentry * @path: the dentry/vfsmount to report * @root: root vfsmnt/dentry (may be modified by this function) - * @buffer: buffer to return value in + * @buf: buffer to return value in * @buflen: buffer length * * Convert a dentry into an ASCII path name. diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index aea1d3f1ffb..439fc1f1c1c 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -210,6 +210,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) int flags = vma->vm_flags; unsigned long ino = 0; unsigned long long pgoff = 0; + unsigned long start; dev_t dev = 0; int len; @@ -220,8 +221,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; } + /* We don't show the stack guard page in /proc/maps */ + start = vma->vm_start; + if (vma->vm_flags & VM_GROWSDOWN) + start += PAGE_SIZE; + seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", - vma->vm_start, + start, vma->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', |