From patchwork Thu Apr 21 00:39:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 12820966 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9529DC433FE for ; Thu, 21 Apr 2022 00:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1383506AbiDUAod (ORCPT ); Wed, 20 Apr 2022 20:44:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1383503AbiDUAmU (ORCPT ); Wed, 20 Apr 2022 20:42:20 -0400 Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B4CA23140 for ; Wed, 20 Apr 2022 17:39:32 -0700 (PDT) Date: Thu, 21 Apr 2022 00:39:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail2; t=1650501571; bh=wuC1+vhay3ASZ7SmRAfdiwma2HlM/uaJNS3a/KTFZuQ=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=NIW25xfbt5y/meQ91SkENqxh9jDr3xHuEFfIe9oFetZeS9Esx9nq8D+f3xtwOA4R5 b8GP5uR12nhhBLrs6GCiJ9HDeL2dRxCDOeTJFvJrsvupR+G9tQBAfOuRy3NbmPIKQG yUsJCTvZzpOmbj9S6V4ErjLhrazOgUcobhQeqJXW4HwXhIeTgHVcnj+sK2WvRUkvNp dnrx3QM6E4YCMKtE3+EIDd8FW/HTImIihzbNRxk28a1+yBz0CpoF09lH7OXpmdDOl+ bWGk2DnVUw9kxrDqtPC+fMy3Eakf9VhoJseNmaf9Rycy1KX5opa+VHbFubileRA6jJ 71UbHrbwvhDsQ== To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko From: Alexander Lobakin Cc: Alexander Lobakin , Maciej Fijalkowski , Song Liu , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Alexander Lobakin Subject: [PATCH v2 bpf 05/11] samples/bpf: add 'asm/mach-generic' include path for every MIPS Message-ID: <20220421003152.339542-6-alobakin@pm.me> In-Reply-To: <20220421003152.339542-1-alobakin@pm.me> References: <20220421003152.339542-1-alobakin@pm.me> Feedback-ID: 22809121:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Fix the following: In file included from samples/bpf/tracex2_kern.c:7: In file included from ./include/linux/skbuff.h:13: In file included from ./include/linux/kernel.h:22: In file included from ./include/linux/bitops.h:33: In file included from ./arch/mips/include/asm/bitops.h:20: In file included from ./arch/mips/include/asm/barrier.h:11: ./arch/mips/include/asm/addrspace.h:13:10: fatal error: 'spaces.h' file not found #include ^~~~~~~~~~ 'arch/mips/include/asm/mach-generic' should always be included as many other MIPS include files rely on this. Move it from under CONFIG_MACH_LOONGSON64 to let it be included for every MIPS. Fixes: 058107abafc7 ("samples/bpf: Add include dir for MIPS Loongson64 to fix build errors") Acked-by: Song Liu Signed-off-by: Alexander Lobakin --- samples/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.36.0 diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 38638845db9d..70323ac1114f 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -194,8 +194,8 @@ ifeq ($(ARCH), mips) TPROGS_CFLAGS += -D__SANE_USERSPACE_TYPES__ ifdef CONFIG_MACH_LOONGSON64 BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-loongson64 -BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic endif +BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic endif TPROGS_CFLAGS += -Wall -O2