Don't panic on chained s/g lists. Only compile-tested. Signed-off-by: Stefan Richter <[email protected]> --- drivers/firewire/fw-sbp2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux/drivers/firewire/fw-sbp2.c =================================================================== --- linux.orig/drivers/firewire/fw-sbp2.c +++ linux/drivers/firewire/fw-sbp2.c @@ -1100,9 +1100,9 @@ sbp2_map_scatterlist(struct sbp2_command * elements larger than 65535 bytes, some IOMMUs may merge sg elements * during DMA mapping, and Linux currently doesn't prevent this. */ - for (i = 0, j = 0; i < count; i++) { - sg_len = sg_dma_len(sg + i); - sg_addr = sg_dma_address(sg + i); + for (i = 0, j = 0; i < count; i++, sg = sg_next(sg)) { + sg_len = sg_dma_len(sg); + sg_addr = sg_dma_address(sg); while (sg_len) { /* FIXME: This won't get us out of the pinch. */ if (unlikely(j >= ARRAY_SIZE(orb->page_table))) { -- Stefan Richter -=====-=-=== =-== --=-- http://arcgraph.de/sr/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- References:
- 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: "Torsten Kaiser" <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: Stefan Richter <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: "Torsten Kaiser" <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: Stefan Richter <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: Jens Axboe <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: Jens Axboe <[email protected]>
- Re: 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- From: "Torsten Kaiser" <[email protected]>
- [PATCH 1/3 2.6.24-rc1-gitX] ieee1394: iso and async streams: s/g list fix
- From: Stefan Richter <[email protected]>
- [PATCH 2/3 2.6.24-rc1-gitX] ieee1394: sbp2: s/g list fix
- From: Stefan Richter <[email protected]>
- 2.6.24-rc1-54866f032307063776b4eff7eadb131d47f9f9b4 fails to boot: kernel BUG at include/linux/scatterlist.h:49!
- Prev by Date: [PATCH 2/3 2.6.24-rc1-gitX] ieee1394: sbp2: s/g list fix
- Next by Date: Re: [PATCH] Restore deterministic CPU accounting on powerpc
- Previous by thread: [PATCH 2/3 2.6.24-rc1-gitX] ieee1394: sbp2: s/g list fix
- Next by thread: Re: [PATCH 2/3 2.6.24-rc1-gitX] ieee1394: sbp2: s/g list fix
- Index(es):
 |