Branch b1_6

Revert this change since it caused build failures.

b=12842

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index d38eb1d..d92ab36 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -101,7 +101,6 @@ AC_SUBST(RELEASE)
 ])
 
 #
-#
 # LB_LINUX_PATH
 #
 # Find paths for linux, handling kernel-source rpms
@@ -188,13 +187,6 @@ if grep rhconfig $LINUX_OBJ/include/linux/version.h >/dev/null ; then
        EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS"
 fi
 
-# Find the modpost utility
-AC_CHECK_FILE([$LINUX_OBJ/scripts/mod/modpost],
-       [MODPOST=$LINUX_OBJ/scripts/mod/modpost],
-       [AC_MSG_ERROR([modpost not found.])]
-)
-AC_SUBST(MODPOST)
-
 # this is needed before we can build modules
 LB_LINUX_UML
 LB_LINUX_VERSION
@@ -207,11 +199,11 @@ LB_LINUX_TRY_COMPILE([],[],[
        AC_MSG_RESULT([no])
        AC_MSG_WARN([Consult config.log for details.])
        AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult build/README.kernel-source])
-       AC_MSG_ERROR([Kernel modules cannot be built.])
+       AC_MSG_ERROR([Kernel modules cannot be build.])
 ])
 
 LB_LINUX_RELEASE
-]) # end of LB_LINUX_PATH
+])
 
 #
 # LB_LINUX_UML

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 4377660..f7b83ad 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -70,11 +70,3 @@ CLEANFILES = sources $(notdir $(linux_headers) $(ext3_headers) $(ext3_sources) $
 
 clean: clean-am
        rm -rf linux linux-stage
-
-all: @LINUX_OBJ@/Module.symvers
-
-# Update the kernel's Module.symvers to add ldiskfs symbols before building
-# fsfilt_ldiskfs - see bug 12842.
-@LINUX_OBJ@/Module.symvers: ldiskfs.o
-       $(MODPOST) -m -i @LINUX_OBJ@/Module.symvers \
-               -o @LINUX_OBJ@/Module.symvers ldiskfs.o