FireWire update
Linus, please pull from the for-linus branch at
git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git for-linus
to receive the following IEEE 1394 subsystem update. This fixes "2.6.24-rc1-54866.. fails to boot: kernel BUG at include/linux/scatterlist.h:49!", bug# 9296.
drivers/ieee1394/dma.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
Jens Axboe (1):
ieee1394: iso and async streams: s/g list fix
Full log and diff:
commit 9e66269d40229cd9823024120910a43af57a9d72
Author: Jens Axboe <[email protected]> Date: Sun Nov 4 09:44:56 2007 +0100
ieee1394: iso and async streams: s/g list fix
Torsten Kaiser wrote:
> Looking that calltrace upwards, it seems replacing the
> memset(dma->sglist,...) with sg_init_table(...) would fix the BUG_ON() > as that inits the SG_MAGIC.
Tested-by Torsten Kaiser <[email protected]>
Signed-off-by Stefan Richter <[email protected]>
drivers/ieee1394/dma.c +1 -2
@@ -103,8 +103,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes, goto err; } -/* just to be safe - this will become unnecessary once sglist->address goes away */ -memset (dma->sglist,0 , dma->n_pages *sizeof (*dma->sglist)); +sg_init_table (dma->sglist, dma->n_pages);/* fill scatter/gather list with pages */ for (i =0 ; i < dma->n_pages; i++) {
Signature · 3 lines
Stefan Richter -=====-=-=== =-== --=-- http://arcgraph.de/sr/