From e91444faadb368495b75d871ec6614d075e06979 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sat, 22 Jan 2005 05:35:10 +0000 Subject: 2005-01-22 Guillem Jover * linux/dev/include/linux/skbuff.h (skb_put, skb_push): Fix errors for deprecated use of labels at end of compound statements. * i386/i386/fpe_linkage.c (enable_fpe): Declare prototype. --- ChangeLog | 6 ++++++ i386/i386/fpe_linkage.c | 1 + linux/dev/include/linux/skbuff.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index dc691bf..834edb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-22 Guillem Jover + + * linux/dev/include/linux/skbuff.h (skb_put, skb_push): Fix errors + for deprecated use of labels at end of compound statements. + * i386/i386/fpe_linkage.c (enable_fpe): Declare prototype. + 2005-01-22 Guillem Jover * linux/src/drivers/scsi/qlogicisp_asm.c: Remove file with binary diff --git a/i386/i386/fpe_linkage.c b/i386/i386/fpe_linkage.c index e32f7fa..02bd24d 100644 --- a/i386/i386/fpe_linkage.c +++ b/i386/i386/fpe_linkage.c @@ -86,6 +86,7 @@ extern void fix_desc(); ((struct real_gate *)&curr_idt(mycpu)[idx]) void set_user_access(); /* forward */ +void enable_fpe(register struct i386_fpsave_state *ifps); /* * long pointer for calling FPE register recovery routine. diff --git a/linux/dev/include/linux/skbuff.h b/linux/dev/include/linux/skbuff.h index 3f3128e..cbaba20 100644 --- a/linux/dev/include/linux/skbuff.h +++ b/linux/dev/include/linux/skbuff.h @@ -407,6 +407,7 @@ extern __inline__ unsigned char *skb_put(struct sk_buff *skb, int len) __label__ here; panic("skput:over: %p:%d", &&here,len); here: + ; } return tmp; } @@ -420,6 +421,7 @@ extern __inline__ unsigned char *skb_push(struct sk_buff *skb, int len) __label__ here; panic("skpush:under: %p:%d", &&here,len); here: + ; } return skb->data; } -- cgit v1.2.3