Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752389Ab1ETEOW (ORCPT ); Fri, 20 May 2011 00:14:22 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:35581 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397Ab1ETEOU (ORCPT ); Fri, 20 May 2011 00:14:20 -0400 Date: Fri, 20 May 2011 14:14:17 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jacek Luczak , David Miller , , Lai Jiangshan , "Paul E. McKenney" Subject: linux-next: build failure after merge of the tip tree (net tree interaction) Message-Id: <20110520141417.f49bf364.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1672 Lines: 50 Hi all, After merging the tip tree, today's linux-next build (x86_64 allmodconfig) failed like this: net/sctp/bind_addr.c: In function 'sctp_bind_addr_clean': net/sctp/bind_addr.c:148: error: 'sctp_local_addr_free' undeclared (first use in this function) Caused by commit 1231f0baa547 ("net,rcu: convert call_rcu (sctp_local_addr_free) to kfree_rcu()") interacting with commit c182f90bc1f2 ("SCTP: fix race between sctp_bind_addr_free() and sctp_bind_addr_conflict()") from the net tree. I applied the following patch as a merge fix: From: Stephen Rothwell Date: Fri, 20 May 2011 14:11:11 +1000 Subject: [PATCH] net,rcu: convert another call to call_rcu(sctp_local_addr_free) Signed-off-by: Stephen Rothwell --- net/sctp/bind_addr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index 6338413..83e3011 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c @@ -145,7 +145,7 @@ static void sctp_bind_addr_clean(struct sctp_bind_addr *bp) /* Empty the bind address list. */ list_for_each_entry_safe(addr, temp, &bp->address_list, list) { list_del_rcu(&addr->list); - call_rcu(&addr->rcu, sctp_local_addr_free); + kfree_rcu(addr, rcu); SCTP_DBG_OBJCNT_DEC(addr); } } -- 1.7.5.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- 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/