[PATCH v2] staging: lustre: fix symbol redeclared with different type in libcfs

From: Maxime Lorrillere
Date: Sat Aug 15 2015 - 04:36:01 EST

lbug_with_loc is declared with __attribute__((noreturn)) in libcfs_private.h
and without this attribute in linux-debug.c. This generates the following
sparse error:
>>> drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c:149:6: error: symbol 'lbug_with_loc' redeclared with different type (originally declared at drivers/staging/lustre/lustre/libcfs/linux/../../../include/linux/libcfs/libcfs_private.h:82) - different modifiers

This patches removes this attribute in libcfs_private.h as it seems to me that
this optimization is not necessary.

Signed-off-by: Maxime Lorrillere <maxime.lorrillere@xxxxxxxxx>
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index 9544860..e60b92b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -79,7 +79,7 @@ do { \

#define KLASSERT(e) LASSERT(e)

-void lbug_with_loc(struct libcfs_debug_msg_data *)__attribute__((noreturn));
+void lbug_with_loc(struct libcfs_debug_msg_data *);

#define LBUG() \
do { \

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/