Commit f1f5929c authored Dec 12, 2016 by Jérémy Lefaure Committed by Linus Torvalds Dec 12, 2016

shmem: fix compilation warnings on unused functions

Compiling shmem.c with SHMEM and TRANSAPRENT_HUGE_PAGECACHE enabled
raises warnings on two unused functions when CONFIG_TMPFS and
CONFIG_SYSFS are both disabled:

  mm/shmem.c:390:20: warning: `shmem_format_huge' defined but not used [-Wunused-function]
   static const char *shmem_format_huge(int huge)
                      ^~~~~~~~~~~~~~~~~
  mm/shmem.c:373:12: warning: `shmem_parse_huge' defined but not used [-Wunused-function]
   static int shmem_parse_huge(const char *str)
               ^~~~~~~~~~~~~~~~

A conditional compilation on tmpfs or sysfs removes the warnings.

Link: http://lkml.kernel.org/r/20161118055749.11313-1-jeremy.lefaure@lse.epita.fr


Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bace9248

mm/shmem.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -370,6 +370,7 @@ static bool shmem_confirm_swap(struct address_space *mapping,

		int shmem_huge __read_mostly;

		#if defined(CONFIG_SYSFS) \|\| defined(CONFIG_TMPFS)
		static int shmem_parse_huge(const char *str)
		{
		if (!strcmp(str, "never"))
		@@ -407,6 +408,7 @@ static const char *shmem_format_huge(int huge)
		return "bad_val";
		}
		}
		#endif

		static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo,
		struct shrink_control *sc, unsigned long nr_to_split)

Admin message