public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Einar Lueck <elueck@de.ibm.com>
Cc: linux-kernel@vger.kernel.org, netdev@oss.sgi.com
Subject: [2.6 patch] fix net/ipv4/route.c with gcc 3.4
Date: Tue, 22 Mar 2005 13:22:13 +0100	[thread overview]
Message-ID: <20050322122213.GH3982@stusta.de> (raw)
In-Reply-To: <20050321025159.1cabd62e.akpm@osdl.org>

The following compile error comes from Linus' tree with 
CONFIG_IP_ROUTE_MULTIPATH_CACHED=y:

<--  snip  -->

...
  CC      net/ipv4/route.o
net/ipv4/route.c: In function `rt_remove_balanced_route':
net/ipv4/route.c:151: sorry, unimplemented: inlining failed in call to 'compare_keys': function body not available
net/ipv4/route.c:540: sorry, unimplemented: called from here
make[2]: *** [net/ipv4/route.o] Error 1

<--  snip  -->


This patch fixes this compile error by moving compare_keys up.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 net/ipv4/route.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

--- linux-2.6.12-rc1-mm1-full/net/ipv4/route.c.old	2005-03-22 13:10:35.000000000 +0100
+++ linux-2.6.12-rc1-mm1-full/net/ipv4/route.c	2005-03-22 13:12:29.000000000 +0100
@@ -148,7 +148,6 @@
 static void		 ipv4_link_failure(struct sk_buff *skb);
 static void		 ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu);
 static int rt_garbage_collect(void);
-static inline int compare_keys(struct flowi *fl1, struct flowi *fl2);
 
 
 static struct dst_ops ipv4_dst_ops = {
@@ -450,6 +449,13 @@
 
 #endif /* CONFIG_PROC_FS */
   
+static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
+{
+	return memcmp(&fl1->nl_u.ip4_u, &fl2->nl_u.ip4_u, sizeof(fl1->nl_u.ip4_u)) == 0 &&
+	       fl1->oif     == fl2->oif &&
+	       fl1->iif     == fl2->iif;
+}
+
 static __inline__ void rt_free(struct rtable *rt)
 {
 	multipath_remove(rt);
@@ -858,13 +864,6 @@
 out:	return 0;
 }
 
-static inline int compare_keys(struct flowi *fl1, struct flowi *fl2)
-{
-	return memcmp(&fl1->nl_u.ip4_u, &fl2->nl_u.ip4_u, sizeof(fl1->nl_u.ip4_u)) == 0 &&
-	       fl1->oif     == fl2->oif &&
-	       fl1->iif     == fl2->iif;
-}
-
 static int rt_intern_hash(unsigned hash, struct rtable *rt, struct rtable **rp)
 {
 	struct rtable	*rth, **rthp;


  parent reply	other threads:[~2005-03-22 12:23 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-03-21 10:51 2.6.12-rc1-mm1 Andrew Morton
2005-03-21 17:05 ` 2.6.12-rc1-mm1 Brice Goglin
2005-03-21 17:09 ` 2.6.12-rc1-mm1 Jesse Barnes
2005-03-21 17:15 ` 2.6.12-rc1-mm1 Jesse Barnes
2005-03-21 20:25   ` 2.6.12-rc1-mm1 Adrian Bunk
2005-03-22  0:42     ` 2.6.12-rc1-mm1 Jesse Barnes
2005-03-22  6:50       ` 2.6.12-rc1-mm1 Arjan van de Ven
2005-03-22  9:18       ` 2.6.12-rc1-mm1 Adrian Bunk
2005-03-22 16:50         ` 2.6.12-rc1-mm1 Jesse Barnes
2005-03-21 20:20 ` 2.6.12-rc1-mm1 Russell King
2005-03-21 20:41   ` 2.6.12-rc1-mm1 Andrew Morton
2005-03-21 21:26     ` PCMCIA bugs in buglist [Was: Re: 2.6.12-rc1-mm1] Dominik Brodowski
2005-03-22  3:51     ` ALSA bugs in list [was " Lee Revell
2005-03-22  4:10       ` Andrew Morton
2005-03-22  4:16         ` Lee Revell
2005-03-22  4:23           ` Andrew Morton
2005-03-22  4:30             ` Lee Revell
2005-03-22 10:05             ` Takashi Iwai
2005-03-22 10:06           ` Jaroslav Kysela
2005-03-21 22:43 ` 2.6.12-rc1-mm1: Kernel BUG at pci:389 Rafael J. Wysocki
2005-03-22  0:03   ` Andrew Morton
2005-03-22  0:44     ` Pavel Machek
2005-03-22  1:06       ` Andrew Morton
2005-03-22  1:35         ` Pavel Machek
2005-03-22  1:49           ` Pavel Machek
2005-03-22  1:52           ` Andrew Morton
2005-03-22  2:07             ` Pavel Machek
2005-03-22  2:27               ` Andrew Morton
2005-03-22  7:21                 ` Greg KH
2005-03-22 12:22                 ` pm_message_t to struct conversion [was Re: 2.6.12-rc1-mm1: Kernel BUG at pci:389] Pavel Machek
2005-03-22  3:14           ` 2.6.12-rc1-mm1: Kernel BUG at pci:389 Li Shaohua
2005-03-22  4:04             ` Len Brown
2005-03-22 11:01               ` Pavel Machek
2005-03-22 21:49                 ` 2.6.12-rc1-mm1: resume regression (was: Re: 2.6.12-rc1-mm1: Kernel BUG at pci:389) Rafael J. Wysocki
2005-03-23 22:29                   ` 2.6.12-rc1-mm1: resume regression [update] " Rafael J. Wysocki
2005-03-23 22:39                     ` Pavel Machek
2005-03-23 23:49                       ` Rafael J. Wysocki
2005-03-24  1:03                         ` Len Brown
2005-03-24  1:27                           ` 2.6.12-rc1-mm1: resume regression [update] (was: " Li Shaohua
2005-03-24 13:42                             ` Rafael J. Wysocki
2005-03-25  0:49                               ` Li Shaohua
2005-03-25 11:19                                 ` Rafael J. Wysocki
2005-03-24 23:14                           ` 2.6.12-rc1-mm1: resume regression [update] (was: Re: 2.6.12-rc1-mm1: " Rafael J. Wysocki
2005-03-22 11:00             ` 2.6.12-rc1-mm1: Kernel BUG at pci:389 Pavel Machek
2005-03-22  2:02         ` Dave Jones
2005-03-22  0:53     ` Pavel Machek
2005-03-22 12:22 ` Adrian Bunk [this message]
2005-03-22 16:33 ` 2.6.12-rc1-mm1: hostap stack usage Adrian Bunk
2005-03-23  4:59   ` Jouni Malinen
2005-03-22 17:13 ` 2.6.12-rc1-mm1: REISER4_FS <-> 4KSTACKS Adrian Bunk
2005-03-22 17:50   ` Hans Reiser
2005-03-22 19:21     ` Adrian Bunk
2005-03-22 19:30       ` Jörn Engel
2005-03-22 20:15       ` Hans Reiser
2005-03-22 18:16   ` Arjan van de Ven
2005-03-22 18:56   ` Jörn Engel
2005-03-22 19:09     ` Jörn Engel
2005-03-22 19:17     ` Adrian Bunk
2005-03-24  3:10 ` [-mm patch] drivers/net/chelsio/osdep.h: small cleanups Adrian Bunk
2005-03-24  3:37   ` Christoph Lameter
2005-03-24  5:23     ` Randy.Dunlap
2005-03-24  5:32       ` Christoph Lameter
2005-03-24  5:36       ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050322122213.GH3982@stusta.de \
    --to=bunk@stusta.de \
    --cc=elueck@de.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox