diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
| commit | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (patch) | |
| tree | c353e3ad19017c8f5cdb330d6363ca2845cb11c4 /linux/src | |
| parent | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (diff) | |
| parent | e1f856119dae48fcc1b649521ca45e4bdaa80ea9 (diff) | |
Merge branch 'master' into master-gdb_stubs
Conflicts:
i386/i386at/com.c
Diffstat (limited to 'linux/src')
| -rw-r--r-- | linux/src/drivers/block/triton.c | 8 | ||||
| -rw-r--r-- | linux/src/drivers/scsi/ultrastor.c | 2 | ||||
| -rw-r--r-- | linux/src/include/linux/skbuff.h | 8 |
3 files changed, 4 insertions, 14 deletions
diff --git a/linux/src/drivers/block/triton.c b/linux/src/drivers/block/triton.c index 2e3d1878..3ed069d9 100644 --- a/linux/src/drivers/block/triton.c +++ b/linux/src/drivers/block/triton.c @@ -129,13 +129,7 @@ const char *good_dma_drives[] = {"Micropolis 2112A", "CONNER CTMA 4000", "CONNER CTT8000-A", - // Should work, but kvm/qemu seem to produce - // issues: - // hd1 irq timeout: status=0xd8 { Busy } - // hd0: disabled DMA - // hd1: disabled DMA - // ide0: reset: success - //"QEMU HARDDISK", + "QEMU HARDDISK", NULL}; /* diff --git a/linux/src/drivers/scsi/ultrastor.c b/linux/src/drivers/scsi/ultrastor.c index 3d9b4118..a1a1982d 100644 --- a/linux/src/drivers/scsi/ultrastor.c +++ b/linux/src/drivers/scsi/ultrastor.c @@ -306,7 +306,7 @@ static inline int find_and_clear_bit_16(unsigned short *field) cli(); if (*field == 0) panic("No free mscp"); asm("xorl %0,%0\n0:\tbsfw %1,%w0\n\tbtr %0,%1\n\tjnc 0b" - : "=&r" (rv), "=m" (*field) : "1" (*field)); + : "=&r" (rv), "+m" (*field)); restore_flags(flags); return rv; } diff --git a/linux/src/include/linux/skbuff.h b/linux/src/include/linux/skbuff.h index cf05129b..e4c77b48 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->data<skb->head) { - __label__ here; - panic("skpush:under: %p:%d", &&here,len); -here: + panic("skpush:under: %d", len); } return skb->data; } |