diff options
| author | NeilBrown <neilb@suse.com> | 2018-05-21 14:35:12 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-25 18:29:09 +0200 |
| commit | f72c3ab791ac0b2b75b5b5d4d51d8eb89ea1e515 (patch) | |
| tree | a5f56c45ed0ef6325d728f08ae7a08387d2dfa33 | |
| parent | 64bf0b1a079d61e9e059b9dc7a58e064c7d994ae (diff) | |
staging: lustre: move files out of lustre/lnet/libcfs/linux/
There is no longer any value in having this separate
subdirectory, so promote the files in it.
Also tidy the Makefile a little to use the common "*-obj-y"
macro name. This will allow individual files to be conditionally
compiled.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/Makefile | 17 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/linux-crypto-adler.c (renamed from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/linux-crypto.c (renamed from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/linux-crypto.h (renamed from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/linux-debug.c (renamed from drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c) | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/libcfs/linux-tracefile.c (renamed from drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c) | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/lustre/lnet/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile index e73515789a11..6335f909d22b 100644 --- a/drivers/staging/lustre/lnet/libcfs/Makefile +++ b/drivers/staging/lustre/lnet/libcfs/Makefile @@ -4,14 +4,13 @@ subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include obj-$(CONFIG_LNET) += libcfs.o -libcfs-linux-objs := linux-tracefile.o linux-debug.o -libcfs-linux-objs += linux-crypto.o -libcfs-linux-objs += linux-crypto-adler.o +libcfs-obj-y += linux-tracefile.o linux-debug.o +libcfs-obj-y += linux-crypto.o +libcfs-obj-y += linux-crypto-adler.o -libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs)) +libcfs-obj-y += debug.o fail.o module.o tracefile.o +libcfs-obj-y += libcfs_string.o hash.o +libcfs-obj-y += libcfs_cpu.o +libcfs-obj-y += libcfs_mem.o libcfs_lock.o -libcfs-all-objs := debug.o fail.o module.o tracefile.o \ - libcfs_string.o hash.o \ - libcfs_cpu.o libcfs_mem.o libcfs_lock.o - -libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs) +libcfs-objs := $(libcfs-obj-y) diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lnet/libcfs/linux-crypto-adler.c index db81ed527452..db81ed527452 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c +++ b/drivers/staging/lustre/lnet/libcfs/linux-crypto-adler.c diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux-crypto.c index 18113335503b..18113335503b 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c +++ b/drivers/staging/lustre/lnet/libcfs/linux-crypto.c diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lnet/libcfs/linux-crypto.h index 5616e9ea1450..5616e9ea1450 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h +++ b/drivers/staging/lustre/lnet/libcfs/linux-crypto.h diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux-debug.c index 1d728f18e529..2ca385cbea92 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c +++ b/drivers/staging/lustre/lnet/libcfs/linux-debug.c @@ -53,7 +53,7 @@ #include <linux/libcfs/libcfs.h> -#include "../tracefile.h" +#include "tracefile.h" #include <linux/kallsyms.h> diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lnet/libcfs/linux-tracefile.c index 7928d7182634..3366ae6411ee 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c +++ b/drivers/staging/lustre/lnet/libcfs/linux-tracefile.c @@ -35,7 +35,7 @@ #define LUSTRE_TRACEFILE_PRIVATE #include <linux/libcfs/libcfs.h> -#include "../tracefile.h" +#include "tracefile.h" /* percents to share the total debug memory for each type */ static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = { |