From 59c81a4fba487f3177a7a96816d4f56b0bd4561b Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" <morrone2@llnl.gov> Date: Mon, 29 Oct 2012 19:43:07 -0700 Subject: [PATCH] LU-1199 build: Remove duplicate LC_MODULE_LOADING It appears that LC_MODULE_LOADING was accidentally declared twice back-to-back in the same file. This removes the first declaration on the assumption that if my eye-balling of the code missed a difference, the second one is the one we've been using anyway. Change-Id: I04a9da80d6be7bef6e4fd35eca8f3e490a8a824f Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov> Reviewed-on: http://review.whamcloud.com/4407 Tested-by: Hudson Reviewed-by: Andreas Dilger <adilger@whamcloud.com> Tested-by: Maloo <whamcloud.maloo@gmail.com> Reviewed-by: Keith Mannthey <keith.mannthey@intel.com> Reviewed-by: Oleg Drokin <green@whamcloud.com> --- build/autoconf/lustre-build-linux.m4 | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 01964ab70f..94dd8cf462 100644 --- a/build/autoconf/lustre-build-linux.m4 +++ b/build/autoconf/lustre-build-linux.m4 @@ -589,32 +589,6 @@ LB_LINUX_TRY_MAKE([ ]) ]) -# LC_MODULE_LOADING -# after 2.6.28 CONFIG_KMOD is removed, and only CONFIG_MODULES remains -# so we test if request_module is implemented or not -AC_DEFUN([LC_MODULE_LOADING], -[AC_MSG_CHECKING([if kernel module loading is possible]) -LB_LINUX_TRY_MAKE([ - #include <linux/kmod.h> -],[ - int myretval=ENOSYS ; - return myretval; -],[ - $makerule LUSTRE_KERNEL_TEST=conftest.i -],[ - grep request_module build/conftest.i | grep -v `grep "int myretval=" build/conftest.i | cut -d= -f2 | cut -d" " -f1` >/dev/null -],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_MODULE_LOADING_SUPPORT, 1, - [kernel module loading is possible]) -],[ - AC_MSG_RESULT(no) - AC_MSG_WARN([]) - AC_MSG_WARN([Kernel module loading support is highly recommended.]) - AC_MSG_WARN([]) -]) -]) - # # LB_PROG_LINUX # -- GitLab