diff options
Diffstat (limited to 'linux/src/drivers')
| -rw-r--r-- | linux/src/drivers/block/triton.c | 8 | ||||
| -rw-r--r-- | linux/src/drivers/scsi/ultrastor.c | 2 |
2 files changed, 2 insertions, 8 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; } |