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

Commit 13057efb authored by Stephen Wilson's avatar Stephen Wilson Committed by Linus Torvalds
Browse files

mm: declare mpol_to_str() when CONFIG_TMPFS=n 



When CONFIG_TMPFS=n mpol_to_str() is not declared in mempolicy.h.
However, in the NUMA case, the definition is always compiled.

Since it is not strictly true that tmpfs is the only client, and since the
symbol was always lurking around anyways, export mpol_to_str()
unconditionally.  Furthermore, this will allow us to move show_numa_map()
out of mempolicy.c and into the procfs subsystem.

Signed-off-by: default avatarStephen Wilson <wilsons@start.ca>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9840e372

include/linux/mempolicy.h

+2 −2
Original line number Diff line number Diff line
@@ -231,10 +231,10 @@ int do_migrate_pages(struct mm_struct *mm, 


#ifdef CONFIG_TMPFS

extern int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context);

#endif



extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,

			int no_context);

#endif



/* Check if a vma is migratable */

static inline int vma_migratable(struct vm_area_struct *vma)
@@ -371,13 +371,13 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol, 
{

	return 1;	/* error */

}

#endif



static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,

				int no_context)

{

	return 0;

}

#endif



#endif /* CONFIG_NUMA */

#endif /* __KERNEL__ */