Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f269fdd1 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 930e652a

fs/proc/task_mmu.c

+0 −5
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ struct mem_size_stats 
	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)

{

	struct proc_maps_private *priv = m->private;

include/linux/mm.h

+1 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ void drop_slab(void); 
extern int randomize_va_space;

#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 /* _LINUX_MM_H */

kernel/signal.c

+5 −0
Original line number Diff line number Diff line
@@ -2577,6 +2577,11 @@ asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) 
}

#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)

{

	sigqueue_cachep =