Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / net / ipv4 / fib_trie.c

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 2b555a5521e0b60f8b373b4c72e70d896da15ff0..bce36f1a37b43b5cdbc811ead5b1a01f52de82da 100644 (file)
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -51,7 +51,6 @@
 #define VERSION "0.409"
 
 #include <asm/uaccess.h>
-#include <asm/system.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -1170,9 +1169,8 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
        }
 
        if (tp && tp->pos + tp->bits > 32)
-               pr_warning("fib_trie"
-                          " tp=%p pos=%d, bits=%d, key=%0x plen=%d\n",
-                          tp, tp->pos, tp->bits, key, plen);
+               pr_warn("fib_trie tp=%p pos=%d, bits=%d, key=%0x plen=%d\n",
+                       tp, tp->pos, tp->bits, key, plen);
 
        /* Rebalance the trie */