X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FMakefile;h=5304d7a2f9c13f951f2ecc63b4f58fc5cdb669b1;hb=7357b707a74769565a9a655d81236022160afd11;hp=d13bbb70adc7cae05ece1be8d59727d20dc030c5;hpb=7b16772ac5bd3a3e0b5c7c52d96f261be9b22263;p=fs%2Flustre-release.git

diff --git a/build/Makefile b/build/Makefile
index d13bbb7..5304d7a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,7 +1,7 @@
 #
-# There are three ways this Makefile can be called:
+# There are four ways this Makefile can be called:
+#
 #
-# 
 # 1.  As a subdirectory from the toplevel, for automake
 #
 # 2.  A wrapper around the kernel's makefile when building modules, to
@@ -22,7 +22,7 @@ else
 
 # case #2
 # Note that this comes from make -C $LINUX -f $LUSTRE/build/Makefile
-# So the include Makefile includes $LINUX/Makefile, not this file
+# so "include Makefile" below includes $LINUX/Makefile, not this file
 include $(LUSTRE_LINUX_CONFIG)
 include Makefile
 
@@ -30,20 +30,14 @@ endif # LUSTRE_LINUX_CONFIG
 
 else # PATCHLEVEL
 
-# case 3
-
+# case #3
 ifneq ($(LUSTRE_KERNEL_TEST),)
-ifeq ($(PATCHLEVEL),4)
-all: $(LUSTRE_KERNEL_TEST)
-else
+# extra-y works prior to 5.10
 extra-y = $(LUSTRE_KERNEL_TEST)
-endif
+# always-y works since 5.6
+always-y = $(LUSTRE_KERNEL_TEST)
 endif
 
 obj-m := conftest.o
 
-ifeq ($(PATCHLEVEL),4)
-include $(TOPDIR)/Rules.make
-endif
-
 endif # PATCHLEVEL