Commit da0e6a7a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: lustre: libcfs: remove ccflags from Makefile

There were two paths being added, yet only one was needed.  Remove both,
and fix up the 3 .c files to point to the location of the needed .h
file.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c4fcfbe
...@@ -16,6 +16,3 @@ libcfs-all-objs := debug.o fail.o nidstrings.o module.o tracefile.o \ ...@@ -16,6 +16,3 @@ libcfs-all-objs := debug.o fail.o nidstrings.o module.o tracefile.o \
libcfs_mem.o libcfs_lock.o libcfs_mem.o libcfs_lock.o
libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs) libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
ccflags-y := -I$(src)/../include
ccflags-y += -I$(src)/
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../include/linux/libcfs/libcfs.h"
#include "../../../include/linux/libcfs/linux/portals_compat25.h" #include "../../../include/linux/libcfs/linux/portals_compat25.h"
#include "tracefile.h" #include "../tracefile.h"
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../include/linux/libcfs/libcfs.h"
#include <asm/div64.h> #include <asm/div64.h>
#include "tracefile.h" #include "../tracefile.h"
static ctl_table_header_t *lnet_table_header = NULL; static ctl_table_header_t *lnet_table_header = NULL;
extern char lnet_upcall[1024]; extern char lnet_upcall[1024];
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define LUSTRE_TRACEFILE_PRIVATE #define LUSTRE_TRACEFILE_PRIVATE
#include "../../../include/linux/libcfs/libcfs.h" #include "../../../include/linux/libcfs/libcfs.h"
#include "tracefile.h" #include "../tracefile.h"
/* percents to share the total debug memory for each type */ /* percents to share the total debug memory for each type */
static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = { static unsigned int pages_factor[CFS_TCD_TYPE_MAX] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment