summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2013-02-13 11:20:27 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-13 11:52:04 -0500
commit99d5851eefe589346c976a4b539ee498267bc5fd (patch)
tree9b56c9c0f956a08b6ed47950d85c9ab824fda48a /net/core
parentc6d14ff11bec4c02601be198c84a5c76d1af90fc (diff)
downloadop-kernel-dev-99d5851eefe589346c976a4b539ee498267bc5fd.zip
op-kernel-dev-99d5851eefe589346c976a4b539ee498267bc5fd.tar.gz
net: skbuff: fix compile error in skb_panic()
I get the following build error on next-20130213 due to the following commit: commit f05de73bf82fbbc00265c06d12efb7273f7dc54a ("skbuff: create skb_panic() function and its wrappers"). It adds an argument called panic to a function that uses the BUG() macro which tries to call panic, but the argument masks the panic() function declaration, resulting in the following error (gcc 4.2.4): net/core/skbuff.c In function 'skb_panic': net/core/skbuff.c +126 : error: called object 'panic' is not a function This is fixed by renaming the argument to msg. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Jean Sacren <sakiwit@gmail.com> Cc: Jiri Pirko <jiri@resnulli.us> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/skbuff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 8731c39..21a22cc 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -109,7 +109,7 @@ static const struct pipe_buf_operations sock_pipe_buf_ops = {
* @skb: buffer
* @sz: size
* @addr: address
- * @panic: skb_over_panic or skb_under_panic
+ * @msg: skb_over_panic or skb_under_panic
*
* Out-of-line support for skb_put() and skb_push().
* Called via the wrapper skb_over_panic() or skb_under_panic().
@@ -117,10 +117,10 @@ static const struct pipe_buf_operations sock_pipe_buf_ops = {
* __builtin_return_address is not used because it is not always reliable.
*/
static void skb_panic(struct sk_buff *skb, unsigned int sz, void *addr,
- const char panic[])
+ const char msg[])
{
pr_emerg("%s: text:%p len:%d put:%d head:%p data:%p tail:%#lx end:%#lx dev:%s\n",
- panic, addr, skb->len, sz, skb->head, skb->data,
+ msg, addr, skb->len, sz, skb->head, skb->data,
(unsigned long)skb->tail, (unsigned long)skb->end,
skb->dev ? skb->dev->name : "<NULL>");
BUG();
OpenPOWER on IntegriCloud