Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4338/drivers/block
Modified Files:
Kconfig gcn-aram.c gcn-sd.c
Log Message:
2.6.16 merged.
Index: gcn-aram.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-aram.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gcn-aram.c 18 Jan 2006 23:41:52 -0000 1.10
+++ gcn-aram.c 24 Mar 2006 21:45:18 -0000 1.11
@@ -207,7 +207,7 @@
if (req) {
if (!end_that_request_first(req, 1, req->current_nr_sectors)) {
add_disk_randomness(req->rq_disk);
- end_that_request_last(req);
+ end_that_request_last(req, 1);
}
dma_unmap_single(&adev->pdev.dev, adev->dma_addr, adev->dma_len,
rq_dir_to_dma_dir(req));
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Kconfig 18 Jan 2006 23:41:52 -0000 1.20
+++ Kconfig 24 Mar 2006 21:45:18 -0000 1.21
@@ -179,7 +179,7 @@
config PARIDE
tristate "Parallel port IDE device support"
- depends on PARPORT
+ depends on PARPORT_PC
---help---
There are many external CD-ROM and disk devices that connect through
your computer's parallel port. Most of them are actually IDE devices
@@ -420,7 +420,8 @@
This driver supports certain USB attached storage devices
such as flash keys.
- Warning: Enabling this cripples the usb-storage driver.
+ If you enable this driver, it is recommended to avoid conflicts
+ with usb-storage by enabling USB_LIBUSUAL.
If unsure, say N.
@@ -494,12 +495,12 @@
This controls the maximum number of active concurrent packets. More
concurrent packets can increase write performance, but also require
more memory. Each concurrent packet will require approximately 64Kb
- of non-swappable kernel memory, memory which will be allocated at
- pktsetup time.
+ of non-swappable kernel memory, memory which will be allocated when
+ a disc is opened for writing.
config CDROM_PKTCDVD_WCACHE
- bool "Enable write caching"
- depends on CDROM_PKTCDVD
+ bool "Enable write caching (EXPERIMENTAL)"
+ depends on CDROM_PKTCDVD && EXPERIMENTAL
help
If enabled, write caching will be set for the CD-R/W device. For now
this option is dangerous unless the CD-RW media is known good, as we
Index: gcn-sd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gcn-sd.c 7 Nov 2005 21:38:04 -0000 1.6
+++ gcn-sd.c 24 Mar 2006 21:45:18 -0000 1.7
@@ -255,7 +255,7 @@
* FIXME: use a faster method (table)
* (the in-kernel crc 16 (ccitt crc) tables seem not compatible with us)
*/
-u16 crc_xmodem_update(u16 crc, u8 data)
+static u16 crc_xmodem_update(u16 crc, u8 data)
{
int i;
@@ -1183,10 +1183,11 @@
}
if (!end_that_request_first(req, uptodate, nr_sectors))
- end_that_request_last(req);
+ end_that_request_last(req, uptodate);
/* avoid cpu monopolization, we are damn greedy */
- yield();
+ //yield();
+ cond_resched();
spin_lock(&host->queue_lock);
blk_start_queue(host->queue);
|
