From patchwork Wed Jan 13 19:21:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Octavian Purdila X-Patchwork-Id: 42833 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1A209B7CA2 for ; Thu, 14 Jan 2010 06:25:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751560Ab0AMTZO (ORCPT ); Wed, 13 Jan 2010 14:25:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751411Ab0AMTZO (ORCPT ); Wed, 13 Jan 2010 14:25:14 -0500 Received: from ixro-out-rtc.ixiacom.com ([92.87.192.98]:18682 "EHLO ixro-ex1.ixiacom.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750822Ab0AMTZM (ORCPT ); Wed, 13 Jan 2010 14:25:12 -0500 Received: from ixro-opurdila-lap.localnet ([10.205.9.172]) by ixro-ex1.ixiacom.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 13 Jan 2010 21:25:10 +0200 From: Octavian Purdila Organization: Ixia To: "David S. Miller" Subject: Re: linux-next: Tree for January 8 (net/ip.h, BUG=n) Date: Wed, 13 Jan 2010 21:21:44 +0200 User-Agent: KMail/1.12.2 (Linux/2.6.31-trunk-686; KDE/4.3.2; i686; ; ) Cc: Jarek Poplawski , Ingo Molnar , Randy Dunlap , Stephen Rothwell , netdev@vger.kernel.org, linux-next@vger.kernel.org, LKML , Arnd Bergmann References: <20100113085418.GB6053@ff.dom.local> In-Reply-To: <20100113085418.GB6053@ff.dom.local> MIME-Version: 1.0 X-UID: 2197 Message-Id: <201001132121.44763.opurdila@ixiacom.com> X-OriginalArrivalTime: 13 Jan 2010 19:25:11.0148 (UTC) FILETIME=[1FAD9AC0:01CA9486] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wednesday 13 January 2010 10:54:18 you wrote: > Octavian added to cc. > > Jarek P. > > On 13-01-2010 08:35, Ingo Molnar wrote: > > * Randy Dunlap wrote: > >> On Fri, 8 Jan 2010 16:42:32 +1100 Stephen Rothwell wrote: > >>> Hi all, > >>> > >>> Changes since 20100107: > >> > >> When CONFIG_BUG=n, CONFIG_GENERIC_BUG=n: > >> > >> include/net/ip.h:341: error: implicit declaration of function '__WARN' > >> > >> This affects: > >> make[3]: *** [security/selinux/hooks.o] Error 1 > >> make[3]: *** [fs/ceph/messenger.o] Error 1 > >> make[3]: *** [net/core/sock.o] Error 1 > >> make[4]: *** [drivers/net/benet/be_main.o] Error 1 > > > > FYI, this new build bug is now upstream and triggers in -tip testing as > > well. > > > > Ingo > Sorry about this bug and the delay. David, here is a patch against net-2.6 to fix this build error. [PATCH] net: fix build erros with CONFIG_BUG=n, CONFIG_GENERIC_BUG=n Fixed build errors introduced by commit 7ad6848c (ip: fix mc_loop checks for tunnels with multicast outer addresses) Signed-off-by: Octavian Purdila Acked-by: Randy Dunlap --- include/net/ip.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/net/ip.h b/include/net/ip.h index d9a0e74..fb63371 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -338,7 +338,7 @@ static inline int sk_mc_loop(struct sock *sk) return inet6_sk(sk)->mc_loop; #endif } - __WARN(); + WARN_ON(1); return 1; }