staging/lustre/libcfs: Fix build errors for !CONFIG_SMP (dab3aad3) · Commits · 戴 / test

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>

drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@

		#ifndef HAVE_LIBCFS_CPT
		/* Need this for cfs_cpt_table */
		#include <libcfs/libcfs_cpu.h>
		#include <linux/libcfs/libcfs_cpu.h>
		#endif

		#define CFS_PAGE_MASK (~((__u64)PAGE_CACHE_SIZE-1))

drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ cfs_cpt_table_free(struct cfs_cpt_table *cptab)
		}
		EXPORT_SYMBOL(cfs_cpt_table_free);

		#ifdef CONFIG_SMP
		int
		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;
		}
		EXPORT_SYMBOL(cfs_cpt_table_print);
		#endif /* CONFIG_SMP */

		int
		cfs_cpt_number(struct cfs_cpt_table *cptab)

Admin message