From 6847f9c7e42c299ce27459b33885369cee2b26b2 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Thu, 19 May 2011 02:06:08 +0200 Subject: Fix gcc 4.6 build * linux/dev/include/linux/skbuff.h (skb_put, skb_push): Do not print the address of a local label, gcc 4.6 does not build this and the debugger can output it anyway. * linux/src/include/linux/skbuff.h (skb_put, skb_push): Likewise. --- linux/dev/include/linux/skbuff.h | 10 ++-------- linux/src/include/linux/skbuff.h | 8 ++------ 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'linux') diff --git a/linux/dev/include/linux/skbuff.h b/linux/dev/include/linux/skbuff.h index cbaba20..c55e529 100644 --- a/linux/dev/include/linux/skbuff.h +++ b/linux/dev/include/linux/skbuff.h @@ -404,10 +404,7 @@ extern __inline__ unsigned char *skb_put(struct sk_buff *skb, int len) skb->len+=len; if(skb->tail>skb->end) { - __label__ here; - panic("skput:over: %p:%d", &&here,len); -here: - ; + panic("skput:over: %d", len); } return tmp; } @@ -418,10 +415,7 @@ extern __inline__ unsigned char *skb_push(struct sk_buff *skb, int len) skb->len+=len; if(skb->datahead) { - __label__ here; - panic("skpush:under: %p:%d", &&here,len); -here: - ; + panic("skpush:under: %d", len); } return skb->data; } diff --git a/linux/src/include/linux/skbuff.h b/linux/src/include/linux/skbuff.h index cf05129..e4c77b4 100644 --- a/linux/src/include/linux/skbuff.h +++ b/linux/src/include/linux/skbuff.h @@ -405,9 +405,7 @@ extern __inline__ unsigned char *skb_put(struct sk_buff *skb, int len) skb->len+=len; if(skb->tail>skb->end) { - __label__ here; - panic("skput:over: %p:%d", &&here,len); -here: + panic("skput:over: %d", len); } return tmp; } @@ -418,9 +416,7 @@ extern __inline__ unsigned char *skb_push(struct sk_buff *skb, int len) skb->len+=len; if(skb->datahead) { - __label__ here; - panic("skpush:under: %p:%d", &&here,len); -here: + panic("skpush:under: %d", len); } return skb->data; } -- cgit v1.2.3