Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751573AbaGMTAr (ORCPT ); Sun, 13 Jul 2014 15:00:47 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:53648 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751081AbaGMTAl (ORCPT ); Sun, 13 Jul 2014 15:00:41 -0400 Date: Sun, 13 Jul 2014 12:05:12 -0700 From: Greg Kroah-Hartman To: Chen Gang Cc: bergwolf@gmail.com, andreas.dilger@intel.com, standby24x7@gmail.com, oleg.drokin@intel.com, Andriy_Skulysh@xyratex.com, denis.pithon@gmail.com, paf@cray.com, devel@driverdev.osuosl.org, "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] drivers: staging: lustre: Use 'force_die' instead of 'die' to avoid compiling issue Message-ID: <20140713190512.GA27311@kroah.com> References: <53C29CCF.9010008@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53C29CCF.9010008@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jul 13, 2014 at 10:50:55PM +0800, Chen Gang wrote: > Some of architectures have already defined 'die' as macro, so can not use > this common name as declaration in other modules, or will cause compiling > issue. So use more precise name 'force_die' (like 'wrap_bulk') instead of. > > The related error (with allmodconfig under score): > > CC [M] drivers/staging/lustre/lustre/ptlrpc/sec.o > drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'sptlrpc_cli_ctx_expire': > drivers/staging/lustre/lustre/ptlrpc/sec.c:309:13: error: 'struct ptlrpc_ctx_ops' has no member named '__die' > ctx->cc_ops->die(ctx, 0); > ^ > drivers/staging/lustre/lustre/ptlrpc/sec.c: In function 'ctx_refresh_timeout': > drivers/staging/lustre/lustre/ptlrpc/sec.c:594:26: error: 'struct ptlrpc_ctx_ops' has no member named '__die' > req->rq_cli_ctx->cc_ops->die(req->rq_cli_ctx, 0); > ^ > make[5]: *** [drivers/staging/lustre/lustre/ptlrpc/sec.o] Error 1 > make[4]: *** [drivers/staging/lustre/lustre/ptlrpc] Error 2 > make[3]: *** [drivers/staging/lustre/lustre] Error 2 > make[2]: *** [drivers/staging/lustre] Error 2 > make[1]: *** [drivers/staging] Error 2 > make: *** [drivers] Error 2 > > > Signed-off-by: Chen Gang > --- > drivers/staging/lustre/lustre/include/lustre_sec.h | 2 +- > drivers/staging/lustre/lustre/ptlrpc/sec.c | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) This doesn't apply to my tree, can you please refresh it against the staging-next branch of staging.git so that I can apply it? thanks, greg k-h -- 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/