Commit f72c3ab7 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

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: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64bf0b1a
Loading
Loading
Loading
Loading
+8 −9
Original line number Diff line number Diff line
@@ -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)
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@

#include <linux/libcfs/libcfs.h>

#include "../tracefile.h"
#include "tracefile.h"

#include <linux/kallsyms.h>

Loading