Commit bb297bb2 authored Apr 01, 2020 by Christophe Leroy Committed by Linus Torvalds Apr 02, 2020

mm/hugetlb: fix build failure with HUGETLB_PAGE but not HUGEBTLBFS



When CONFIG_HUGETLB_PAGE is set but not CONFIG_HUGETLBFS, the following
build failure is encoutered:

  In file included from arch/powerpc/mm/fault.c:33:0:
  include/linux/hugetlb.h: In function 'hstate_inode':
  include/linux/hugetlb.h:477:9: error: implicit declaration of function 'HUGETLBFS_SB' [-Werror=implicit-function-declaration]
    return HUGETLBFS_SB(i->i_sb)->hstate;
           ^
  include/linux/hugetlb.h:477:30: error: invalid type argument of '->' (have 'int')
    return HUGETLBFS_SB(i->i_sb)->hstate;
                                ^

Gate hstate_inode() with CONFIG_HUGETLBFS instead of CONFIG_HUGETLB_PAGE.

Fixes: a137e1cc ("hugetlbfs: per mount huge page sizes")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Nick Piggin <npiggin@suse.de>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Link: http://lkml.kernel.org/r/7e8c3a3c9a587b9cd8a2f146df32a421b961f3a2.1584432148.git.christophe.leroy@c-s.fr
Link: https://patchwork.ozlabs.org/patch/1255548/#2386036


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cabc30da

include/linux/hugetlb.h

+8 −11

Original line number	Diff line number	Diff line
		@@ -443,7 +443,10 @@ static inline bool is_file_hugepages(struct file *file)
		return is_file_shm_hugepages(file);
		}


		static inline struct hstate hstate_inode(struct inode i)
		{
		return HUGETLBFS_SB(i->i_sb)->hstate;
		}
		#else /* !CONFIG_HUGETLBFS */

		#define is_file_hugepages(file) false
		@@ -455,6 +458,10 @@ hugetlb_file_setup(const char *name, size_t size, vm_flags_t acctflag,
		return ERR_PTR(-ENOSYS);
		}

		static inline struct hstate hstate_inode(struct inode i)
		{
		return NULL;
		}
		#endif /* !CONFIG_HUGETLBFS */

		#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
		@@ -525,11 +532,6 @@ extern unsigned int default_hstate_idx;

		#define default_hstate (hstates[default_hstate_idx])

		static inline struct hstate hstate_inode(struct inode i)
		{
		return HUGETLBFS_SB(i->i_sb)->hstate;
		}

		static inline struct hstate hstate_file(struct file f)
		{
		return hstate_inode(file_inode(f));
		@@ -782,11 +784,6 @@ static inline struct hstate hstate_vma(struct vm_area_struct vma)
		return NULL;
		}

		static inline struct hstate hstate_inode(struct inode i)
		{
		return NULL;
		}

		static inline struct hstate page_hstate(struct page page)
		{
		return NULL;

Admin message