X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FMakefile;h=5304d7a2f9c13f951f2ecc63b4f58fc5cdb669b1;hb=44a359caae004bbdae68f12cf69769fd4c1ecf7c;hp=11c9c6ec622f7ada91842460be81ac2ff46e649b;hpb=b85e9c4dfd29edafbef5cf045b8a839997d15389;p=fs%2Flustre-release.git

diff --git a/build/Makefile b/build/Makefile
index 11c9c6e..5304d7a 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,7 +1,7 @@
 #
 # 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
@@ -10,8 +10,6 @@
 # 3.  At configure time, as the toplevel module dir for building
 #     kernel tests
 #
-# 4.  At configure time, to determine the kernel's idea of $(ARCH)
-#
 
 ifeq ($(PATCHLEVEL),)
 
@@ -32,25 +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
-
-# case 4
-
-echoarch:
-	echo $(ARCH) >$(ARCHFILE)