diff options
| author | Peng Tao <bergwolf@gmail.com> | 2013-07-15 14:27:05 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 19:23:55 (GMT) |
| commit | eba32e16374beb2f479bbbf37dfa8fcf785bac3f (patch) | |
| tree | c13c2fa9d126f48c98f6889dd3fa1ca4644e2f78 /drivers | |
| parent | 4f6cc9ab5337879c4a79564b3aed4fa429d1cd12 (diff) | |
| download | linux-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')
| -rw-r--r-- | drivers/staging/lustre/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/Makefile | 4 |
3 files changed, 4 insertions, 4 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/ diff --git a/drivers/staging/lustre/lnet/Makefile b/drivers/staging/lustre/lnet/Makefile index 374212b..f6f03e3 100644 --- a/drivers/staging/lustre/lnet/Makefile +++ b/drivers/staging/lustre/lnet/Makefile @@ -1 +1 @@ -obj-$(CONFIG_LNET) := klnds/ lnet/ selftest/ +obj-$(CONFIG_LNET) += lnet/ klnds/ selftest/ diff --git a/drivers/staging/lustre/lustre/Makefile b/drivers/staging/lustre/lustre/Makefile index 3fb94fc..d1eb0bd 100644 --- a/drivers/staging/lustre/lustre/Makefile +++ b/drivers/staging/lustre/lustre/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_LUSTRE_FS) := fid/ lvfs/ obdclass/ ptlrpc/ obdecho/ mgc/ lov/ \ - osc/ mdc/ lmv/ llite/ fld/ libcfs/ +obj-$(CONFIG_LUSTRE_FS) += libcfs/ lvfs/ obdclass/ ptlrpc/ fld/ osc/ mgc/ \ + fid/ lov/ mdc/ lmv/ llite/ obdecho/ |