diff options
Diffstat (limited to 'linux/dev')
| -rw-r--r-- | linux/dev/arch/i386/kernel/irq.c | 4 | ||||
| -rw-r--r-- | linux/dev/include/linux/skbuff.h | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c index 8966dea1..7faaa62c 100644 --- a/linux/dev/arch/i386/kernel/irq.c +++ b/linux/dev/arch/i386/kernel/irq.c @@ -229,6 +229,10 @@ setup_x86_irq (int irq, struct linux_action *new) if ((old->flags ^ new->flags) & SA_INTERRUPT) return (-LINUX_EBUSY); + /* Can't share at different levels */ + if (intpri[irq] && linux_intr_pri != intpri[irq]) + return (-LINUX_EBUSY); + /* add new interrupt at end of irq queue */ do { diff --git a/linux/dev/include/linux/skbuff.h b/linux/dev/include/linux/skbuff.h index cbaba20a..c55e5297 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->data<skb->head) { - __label__ here; - panic("skpush:under: %p:%d", &&here,len); -here: - ; + panic("skpush:under: %d", len); } return skb->data; } |