On Mon, 11 Dec 2006, Michael Schmitz wrote:
Well, I've spent a little time to update my Atari patches to 2.6.19-m68k.
There's two details I'd need some advice on - lockdep for the case where
CONFIG_GENERIC_HARDIRQS is not set, and a small fix for scsi_lib. First
lockdep:
drivers/net/8390.c calls disable_irq_nosync_lockdep_irqsave and
enable_irq_lockdep_irqrestore in 2.6.19 now. The EtherNEC driver uses
Yeah, I noticed these, too. Apparently we're the only arch with
CONFIG_GENERIC_HARDIRQS=n using 8390.c.
8390.c so we need these functions on m68k now. I've just added dummy
Be careful with 8390 anyway, as Al Viro rewrote it, cfr. the current git tree
and 2.6.20-rc1 soon.
declarations to make them behave as their non-lockdep counterparts for
now. Can m68k set CONFIG_GENERIC_HARDIRQS?
I don't know, I haven't looked into it yet...
The second item concerns a warning given for each SCSI target scanned on
the Falcon, where sg_tablesize is set to SG_NONE (aka zero). The
blk_queue_max_hw_segments() call should set a minimum size of one
regardless of the sg_tablesize value (blk_queue_max_hw_segments() corrects
this and gives a warning).
--- drivers/scsi/scsi_lib.c.ms-maxhwseg.org 2006-12-09 16:49:29.000000000 +0100
+++ drivers/scsi/scsi_lib.c 2006-12-09 16:49:29.000000000 +0100
@@ -1559,7 +1559,7 @@
blk_queue_prep_rq(q, scsi_prep_fn);
- blk_queue_max_hw_segments(q, shost->sg_tablesize);
+ blk_queue_max_hw_segments(q, (shost->sg_tablesize ? shost->sg_tablesize : 1));
blk_queue_max_phys_segments(q, SCSI_MAX_PHYS_SEGMENTS);
blk_queue_max_sectors(q, shost->max_sectors);
blk_queue_bounce_limit(q, scsi_calculate_bounce_limit(shost));
This one should go directly upstream, I think.
Then please ask/tell linux-scsi and jejb.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
