From 60622c7b2c64cf42db4dbcba1df57096c309cfa7 Mon Sep 17 00:00:00 2001
From: Wang Qing <wangqing@vivo.com>
Date: Wed, 24 Aug 2022 11:19:29 +0800
Subject: [PATCH] bpf, btf: Remove the duplicate btf_ids.h include

mainline inclusion
from mainline-5.11-rc1
commit 666475ccbf1dc99c1e61e47975d5fbf86d6236aa
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=666475ccbf1dc99c1e61e47975d5fbf86d6236aa

-------------------------------------------------

Remove duplicate btf_ids.h header which is included twice.

Signed-off-by: Wang Qing <wangqing@vivo.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/1604736650-11197-1-git-send-email-wangqing@vivo.com
(cherry picked from commit 666475ccbf1dc99c1e61e47975d5fbf86d6236aa)
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
 kernel/bpf/btf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 9a0a9895ec62..0fbff23a7ebb 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -22,7 +22,6 @@
 #include <linux/skmsg.h>
 #include <linux/perf_event.h>
 #include <linux/bsearch.h>
-#include <linux/btf_ids.h>
 #include <net/sock.h>
 
 /* BTF (BPF Type Format) is the meta data format which describes
-- 
GitLab