summaryrefslogtreecommitdiff
path: root/drivers/staging/lustre/Makefile
diff options
context:
space:
mode:
authorPeng Tao <bergwolf@gmail.com>2013-07-15 14:27:05 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-23 19:23:55 (GMT)
commiteba32e16374beb2f479bbbf37dfa8fcf785bac3f (patch)
treec13c2fa9d126f48c98f6889dd3fa1ca4644e2f78 /drivers/staging/lustre/Makefile
parent4f6cc9ab5337879c4a79564b3aed4fa429d1cd12 (diff)
downloadlinux-eba32e16374beb2f479bbbf37dfa8fcf785bac3f.tar.xz
staging/lustre: fix Lustre code link order
Change Makefiles to keep link order in match with Lustre module dependency, so that when Lustre is built in kernel, we'll have the same dependency. Otherwise we'll crash kernel if Lustre is builtin due to missing internal dependency. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Peng Tao <tao.peng@emc.com> Signed-off-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/Makefile')
-rw-r--r--drivers/staging/lustre/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/Makefile b/drivers/staging/lustre/Makefile
index 2616289..fb0e0fa 100644
--- a/drivers/staging/lustre/Makefile
+++ b/drivers/staging/lustre/Makefile
@@ -1,4 +1,4 @@
subdir-ccflags-y := -I$(src)/include/
-obj-$(CONFIG_LUSTRE_FS) += lustre/
obj-$(CONFIG_LNET) += lnet/
+obj-$(CONFIG_LUSTRE_FS) += lustre/