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>

diff --git a/drivers/staging/lustre/lnet/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile
index e73515789a115b6bde8b2d739c3a3523d5eed3c2..6335f909d22b617a84b07595398ad5bd40bab790 100644 (file)
--- 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
similarity index 100%
rename from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
rename to 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
similarity index 100%
rename from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
rename to 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
similarity index 100%
rename from drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
rename to 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
similarity index 99%
rename from drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
rename to drivers/staging/lustre/lnet/libcfs/linux-debug.c
index 1d728f18e52981663235f776778358a8623ef377..2ca385cbea92f48a5a6f74db7483aa0168b50ee6 100644 (file)
--- 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
similarity index 99%
rename from drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
rename to drivers/staging/lustre/lnet/libcfs/linux-tracefile.c
index 7928d71826346a3d47185745f8bd8122481116a9..3366ae6411eeceed6f682cd61d1a793a60a5b273 100644 (file)
--- 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] = {