| Message ID | 201001132121.44763.opurdila@ixiacom.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Octavian Purdila <opurdila@ixiacom.com> Date: Wed, 13 Jan 2010 21:21:44 +0200 > [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 <opurdila@ixiacom.com> Applied, thanks. Let's make sure netdev is CC:'d on networking patches next time. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 13 Jan 2010 21:21:44 +0200 Octavian Purdila wrote: > 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 <randy.dunlap@oracle.com> 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 <opurdila@ixiacom.com> > --- > 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; > } > > -- Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks. --- ~Randy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }