[PATCH] NOMMU: move the fallback arch_vma_name() to a sensible place

Move the fallback arch_vma_name() to a sensible place (kernel/signal.c).

Currently it's in fs/proc/task_mmu.c, a file that is dependent on both
CONFIG_PROC_FS and CONFIG_MMU being enabled, but it's used from
kernel/signal.c from where it is called unconditionally.

[akpm@osdl.org: build fix]
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
David Howells 2006-09-27 01:50:23 -07:00 committed by Linus Torvalds
parent 930e652a21
commit f269fdd182
3 changed files with 6 additions and 6 deletions

View file

@ -122,11 +122,6 @@ struct mem_size_stats
unsigned long private_dirty; unsigned long private_dirty;
}; };
__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma)
{
return NULL;
}
static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss) static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss)
{ {
struct proc_maps_private *priv = m->private; struct proc_maps_private *priv = m->private;

View file

@ -1131,7 +1131,7 @@ void drop_slab(void);
extern int randomize_va_space; extern int randomize_va_space;
#endif #endif
const char *arch_vma_name(struct vm_area_struct *vma); __attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */ #endif /* _LINUX_MM_H */

View file

@ -2577,6 +2577,11 @@ asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
} }
#endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */ #endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */
__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma)
{
return NULL;
}
void __init signals_init(void) void __init signals_init(void)
{ {
sigqueue_cachep = sigqueue_cachep =