summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2005-01-22 05:35:10 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:15:26 +0200
commite91444faadb368495b75d871ec6614d075e06979 (patch)
treef80670059ee25ff1ab97acbd7ed75f0035e7ce65
parentb75b2580fd9f0ad612cc92d580ef00bf875aa8cf (diff)
2005-01-22 Guillem Jover <guillem@hadrons.org>
* 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.
-rw-r--r--ChangeLog6
-rw-r--r--i386/i386/fpe_linkage.c1
-rw-r--r--linux/dev/include/linux/skbuff.h2
3 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc691bf..834edb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-01-22 Guillem Jover <guillem@hadrons.org>
+ * 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 <guillem@hadrons.org>
+
* linux/src/drivers/scsi/qlogicisp_asm.c: Remove file with binary
only firmware.
* linux/src/drivers/scsi/qlogicisp.c: Do not include "qlogicisp_asm.c".
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;
}