Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 19:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging/lustre/libcfs: Fix build errors for !CONFIG_SMP

Browse Source 
When CONFIG_SMP=n:

drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:58:31: fatal error: libcfs/libcfs_cpu.h: No such file or directory

drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c:78:1: error: redefinition of 'cfs_cpt_table_print'
drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h:109:1: note: previous definition of 'cfs_cpt_table_print' was here

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geert Uytterhoeven 2014-05-02 18:28:33 +02:00 committed by Greg Kroah-Hartman
parent ee02eb4ae4
commit dab3aad369
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
View File

@ -55,7 +55,7 @@
#ifndef HAVE_LIBCFS_CPT #ifndef HAVE_LIBCFS_CPT
/* Need this for cfs_cpt_table */ /* Need this for cfs_cpt_table */
#include <libcfs/libcfs_cpu.h> #include <linux/libcfs/libcfs_cpu.h>
#endif #endif
#define CFS_PAGE_MASK (~((__u64)PAGE_CACHE_SIZE-1)) #define CFS_PAGE_MASK (~((__u64)PAGE_CACHE_SIZE-1))

2
drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
View File

@ -74,6 +74,7 @@ cfs_cpt_table_free(struct cfs_cpt_table *cptab)
} }
EXPORT_SYMBOL(cfs_cpt_table_free); EXPORT_SYMBOL(cfs_cpt_table_free);
#ifdef CONFIG_SMP
int int
cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len) cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
{ {
@ -87,6 +88,7 @@ cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
return rc; return rc;
} }
EXPORT_SYMBOL(cfs_cpt_table_print); EXPORT_SYMBOL(cfs_cpt_table_print);
#endif /* CONFIG_SMP */
int int
cfs_cpt_number(struct cfs_cpt_table *cptab) cfs_cpt_number(struct cfs_cpt_table *cptab)