Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751896AbbHOIfb (ORCPT ); Sat, 15 Aug 2015 04:35:31 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:34637 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750987AbbHOIf1 (ORCPT ); Sat, 15 Aug 2015 04:35:27 -0400 From: Maxime Lorrillere To: Oleg Drokin , Andreas Dilger , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Maxime Lorrillere Subject: [PATCH v2] staging: lustre: fix symbol redeclared with different type in libcfs Date: Sat, 15 Aug 2015 10:35:20 +0200 Message-Id: <1439627720-20748-1-git-send-email-maxime.lorrillere@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1539 Lines: 34 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 --- 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 { \ -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/