diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/proc/task_mmu.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/proc/task_mmu.c')
| -rw-r--r-- | fs/proc/task_mmu.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 0a163a4f7764..6b769afac55a 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
| @@ -122,11 +122,6 @@ struct mem_size_stats | |||
| 122 | unsigned long private_dirty; | 122 | unsigned long private_dirty; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| 125 | __attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma) | ||
| 126 | { | ||
| 127 | return NULL; | ||
| 128 | } | ||
| 129 | |||
| 130 | static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss) | 125 | static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss) |
| 131 | { | 126 | { |
| 132 | struct proc_maps_private *priv = m->private; | 127 | struct proc_maps_private *priv = m->private; |