summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/Makefile
diff options
context:
space:
mode:
authorPeng Tao2013-07-15 16:27:05 +0200
committerGreg Kroah-Hartman2013-07-23 21:23:55 +0200
commiteba32e16374beb2f479bbbf37dfa8fcf785bac3f (patch)
treec13c2fa9d126f48c98f6889dd3fa1ca4644e2f78 /drivers/staging/lustre/Makefile
parentstaging/lustre: replace num_physpages with totalram_pages (diff)
downloadkernel-qcow2-linux-eba32e16374beb2f479bbbf37dfa8fcf785bac3f.tar.gz
kernel-qcow2-linux-eba32e16374beb2f479bbbf37dfa8fcf785bac3f.tar.xz
kernel-qcow2-linux-eba32e16374beb2f479bbbf37dfa8fcf785bac3f.zip
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 26162893fd20..fb0e0faf0760 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/