Re: linux-next: build failure after merge of the kbuild tree

[Masahiro Yamada <masahiroy@kernel.org>]

On Mon, Apr 6, 2020 at 11:34 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the kbuild tree, today's linux-next build (powercp
> allyesconfig) failed like this:
>
> In file included from net/netfilter/nft_set_pipapo.c:342:
> net/netfilter/nft_set_pipapo_avx2.h:4:10: fatal error: asm/fpu/xstate.h: No such file or directory
>     4 | #include <asm/fpu/xstate.h>
>       |          ^~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   b851fc367202 ("x86: update AS_* macros to binutils >=2.23, supporting ADX and AVX2")
>
> I have reverted that commit for today.

I will fix as follows:


diff --git a/net/netfilter/nft_set_pipapo_avx2.h
b/net/netfilter/nft_set_pipapo_avx2.h
index 8467337c5f4c..a1cde35fdad6 100644
--- a/net/netfilter/nft_set_pipapo_avx2.h
+++ b/net/netfilter/nft_set_pipapo_avx2.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 #ifndef _NFT_SET_PIPAPO_AVX2_H

+#ifdef CONFIG_X86_64
 #include <asm/fpu/xstate.h>
 #define NFT_PIPAPO_ALIGN       (XSAVE_YMM_SIZE / BITS_PER_BYTE)

@@ -8,4 +9,6 @@ bool nft_pipapo_avx2_lookup(const struct net *net,
const struct nft_set *set,
                            const u32 *key, const struct nft_set_ext **ext);
 bool nft_pipapo_avx2_estimate(const struct nft_set_desc *desc, u32 features,
                              struct nft_set_estimate *est);
+#endif /* CONFIG_X86_64 */
+
 #endif /* _NFT_SET_PIPAPO_AVX2_H */



-- 
Best Regards
Masahiro Yamada