From 1003b065cd0bdcb971c7dbafe434202da7f3c733 Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Wed, 20 Mar 2019 17:19:06 +0800 Subject: [PATCH] hns3: Makefile: remove unnecessary kcompat.o hulk inclusion category: feature bugzilla: 12807 CVE: NA ------------------------------------------------- Now hns3 driver will be rebuild without changing any code: [root@localhost hulk-4.19]# make -j64 CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC [M] drivers/net/ethernet/hisilicon/hns3/kcompat.o CC [M] drivers/net/ethernet/hisilicon/hns3/hns3pf/../kcompat.o LD [M] drivers/net/ethernet/hisilicon/hns3/hns3.o LD [M] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.o Building modules, stage 2. MODPOST 1400 modules CC drivers/net/ethernet/hisilicon/hns3/hns3.mod.o CC drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.mod.o LD [M] drivers/net/ethernet/hisilicon/hns3/hns3.ko LD [M] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.ko [root@localhost hulk-4.19]# make -j64 CALL scripts/checksyscalls.sh CHK include/generated/compile.h CC [M] drivers/net/ethernet/hisilicon/hns3/kcompat.o LD [M] drivers/net/ethernet/hisilicon/hns3/hns3.o Building modules, stage 2. MODPOST 1400 modules CC drivers/net/ethernet/hisilicon/hns3/hns3.mod.o CC drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.mod.o LD [M] drivers/net/ethernet/hisilicon/hns3/hns3.ko LD [M] drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge.ko It's introduced by build kcompat.o both in hns3 and hns3/hns3pf. kcompat.c provide pci_irq* relatived interfaces for driver building in earlier version kernel. Now hulk-4.19 has these interfaces, it can be removed to fix this problem. Signed-off-by: Yang Yingliang Reviewed-by: Xie XiuQi Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/Makefile b/drivers/net/ethernet/hisilicon/hns3/Makefile index cdf7413c6f1a..d01bf536eb86 100644 --- a/drivers/net/ethernet/hisilicon/hns3/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/Makefile @@ -9,6 +9,6 @@ obj-$(CONFIG_HNS3) += hns3vf/ obj-$(CONFIG_HNS3) += hnae3.o obj-$(CONFIG_HNS3_ENET) += hns3.o -hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o kcompat.o +hns3-objs = hns3_enet.o hns3_ethtool.o hns3_debugfs.o hns3-$(CONFIG_HNS3_DCB) += hns3_dcbnl.o diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile index 251d3a7da79b..6c0033248033 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile @@ -6,6 +6,6 @@ ccflags-y := -Idrivers/net/ethernet/hisilicon/hns3 obj-$(CONFIG_HNS3_HCLGE) += hclge.o -hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_debugfs.o hclge_err.o ../kcompat.o +hclge-objs = hclge_main.o hclge_cmd.o hclge_mdio.o hclge_tm.o hclge_mbx.o hclge_debugfs.o hclge_err.o hclge-$(CONFIG_HNS3_DCB) += hclge_dcb.o -- GitLab