Commit 329105ce authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Fix get_hugepd_cache_index() build failure 



With CONFIG_BUG=n, the 64-bit Book3S build fails with:

  arch/powerpc/include/asm/book3s/64/pgtable-64k.h: In function 'get_hugepd_cache_index':
  arch/powerpc/include/asm/book3s/64/pgtable-64k.h:51:1: error: no return statement in function returning non-void

Currently the body of the function is just BUG(), so when CONFIG_BUG=n
it is an empty function, leading to the error.

get_hugepd_cache_index() should never be called, the only call is behind
an is_hugepd() check, which is always false for this configuration.

Instead mark it as always inline, and change the BUG() to BUILD_BUG().
That should allow the compiler to see that the function is never called,
and therefore that it never returns, fixing the build error.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240306125853.3714578-1-mpe@ellerman.id.au
parent 5b9e00a6

arch/powerpc/include/asm/book3s/64/pgtable-64k.h

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static inline int hugepd_ok(hugepd_t hpd) 
/*

 * This should never get called

 */

static inline int get_hugepd_cache_index(int index)

static __always_inline int get_hugepd_cache_index(int index)

{

	BUG();

	BUILD_BUG();

}



#endif /* CONFIG_HUGETLB_PAGE */