tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

net: move CONFIG_NET guard to top Makefile

When CONFIG_NET is disabled, nothing under the net/ directory is
compiled. Move the CONFIG_NET guard to the top Makefile so the net/
directory is entirely skipped.

When Kbuild visits net/Makefile, CONFIG_NET is obvioulsy 'y' because
CONFIG_NET is a bool option. Clean up net/Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210125231659.106201-1-masahiroy@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Masahiro Yamada and committed by
Jakub Kicinski 8b5f4eb3 69783429

+6 -8
+2 -1
Makefile
··· 649 649 core-y := init/ usr/ 650 650 drivers-y := drivers/ sound/ 651 651 drivers-$(CONFIG_SAMPLES) += samples/ 652 - drivers-y += net/ virt/ 652 + drivers-$(CONFIG_NET) += net/ 653 + drivers-y += virt/ 653 654 libs-y := lib/ 654 655 endif # KBUILD_EXTMOD 655 656
+4 -7
net/Makefile
··· 6 6 # Rewritten to use lists instead of if-statements. 7 7 # 8 8 9 - obj-$(CONFIG_NET) := devres.o socket.o core/ 9 + obj-y := devres.o socket.o core/ 10 10 11 - tmp-$(CONFIG_COMPAT) := compat.o 12 - obj-$(CONFIG_NET) += $(tmp-y) 11 + obj-$(CONFIG_COMPAT) += compat.o 13 12 14 13 # LLC has to be linked before the files in net/802/ 15 14 obj-$(CONFIG_LLC) += llc/ 16 - obj-$(CONFIG_NET) += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/ 15 + obj-y += ethernet/ 802/ sched/ netlink/ bpf/ ethtool/ 17 16 obj-$(CONFIG_NETFILTER) += netfilter/ 18 17 obj-$(CONFIG_INET) += ipv4/ 19 18 obj-$(CONFIG_TLS) += tls/ 20 19 obj-$(CONFIG_XFRM) += xfrm/ 21 20 obj-$(CONFIG_UNIX_SCM) += unix/ 22 - obj-$(CONFIG_NET) += ipv6/ 21 + obj-y += ipv6/ 23 22 obj-$(CONFIG_BPFILTER) += bpfilter/ 24 23 obj-$(CONFIG_PACKET) += packet/ 25 24 obj-$(CONFIG_NET_KEY) += key/ ··· 62 63 obj-$(CONFIG_IEEE802154) += ieee802154/ 63 64 obj-$(CONFIG_MAC802154) += mac802154/ 64 65 65 - ifeq ($(CONFIG_NET),y) 66 66 obj-$(CONFIG_SYSCTL) += sysctl_net.o 67 - endif 68 67 obj-$(CONFIG_DNS_RESOLVER) += dns_resolver/ 69 68 obj-$(CONFIG_CEPH_LIB) += ceph/ 70 69 obj-$(CONFIG_BATMAN_ADV) += batman-adv/