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

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

drivers/staging/lustre/lustre/libcfs/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -16,6 +16,3 @@ libcfs-all-objs := debug.o fail.o nidstrings.o module.o tracefile.o \ 
		   libcfs_mem.o libcfs_lock.o



libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
 


ccflags-y := -I$(src)/../include

ccflags-y += -I$(src)/

drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#include "../../../include/linux/libcfs/libcfs.h"

#include "../../../include/linux/libcfs/linux/portals_compat25.h"



#include "tracefile.h"

#include "../tracefile.h"



#include <linux/kallsyms.h>

drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 


#include "../../../include/linux/libcfs/libcfs.h"

#include <asm/div64.h>

#include "tracefile.h"

#include "../tracefile.h"



static ctl_table_header_t *lnet_table_header = NULL;

extern char lnet_upcall[1024];

drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define LUSTRE_TRACEFILE_PRIVATE



#include "../../../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] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE