Re: 2.6.6-rc2-mm2

From: James Bottomley (James.Bottomley_at_steeleye.com)
Date: 04/30/04

  • Next message: Art Haas: "Problem with recent changes to fs/dcache.c" 
    To: William Lee Irwin III <wli@holomorphy.com>
Date:	29 Apr 2004 21:05:06 -0500

    On Thu, 2004-04-29 at 19:24, William Lee Irwin III wrote:
    > # ChangeSet
    > # 2004/04/25 09:10:30-05:00 akpm@osdl.org
    > # [PATCH] aic7xxx: fix oops whe hardware is not present
    > # From: Herbert Xu <herbert@gondor.apana.org.au>

    OK, well, on inspection that patch is fairly comprehensively incorrect.

    Can you try out the attached? I've compiled it but have nothing to test
    installation with.

    Thanks,

    James

    ===== aic7770_osm.c 1.5 vs edited =====
    --- 1.5/drivers/scsi/aic7xxx/aic7770_osm.c Tue Apr 6 23:09:31 2004
    +++ edited/aic7770_osm.c Thu Apr 29 20:07:39 2004
    @@ -159,10 +159,10 @@
     void
     ahc_linux_eisa_exit(void)
     {
    -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
    - eisa_driver_unregister(&aic7770_driver);
    - free(aic7770_driver.id_table, M_DEVBUF);
    -#endif
    + if(aic7xxx_probe_eisa_vl != 0 && aic7770_driver.id_table != NULL) {
    + eisa_driver_unregister(&aic7770_driver);
    + free(aic7770_driver.id_table, M_DEVBUF);
    + }
     }
     
     static int
    ===== aic7xxx_osm.c 1.51 vs edited =====
    --- 1.51/drivers/scsi/aic7xxx/aic7xxx_osm.c Sun Apr 25 09:11:53 2004
    +++ edited/aic7xxx_osm.c Thu Apr 29 20:32:32 2004
    @@ -843,7 +843,8 @@
     ahc_linux_detect(Scsi_Host_Template *template)
     {
             struct ahc_softc *ahc;
    - int found;
    + int found = 0;
    + int eisa_err, pci_err;
     
     #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
             /*
    @@ -891,21 +892,12 @@
              */
             ahc_list_lockinit();
     
    -#ifdef CONFIG_PCI
    - found = ahc_linux_pci_init();
    - if (found)
    - goto out;
    -#endif
    + pci_err = ahc_linux_pci_init();
    + eisa_err = ahc_linux_eisa_init();
     
    -#ifdef CONFIG_EISA
    - found = ahc_linux_eisa_init();
    - if (found) {
    -#ifdef CONFIG_PCI
    - ahc_linux_pci_exit();
    -#endif
    + if(pci_err && eisa_err)
                     goto out;
    - }
    -#endif
    +
     
             /*
              * Register with the SCSI layer all
    @@ -916,12 +908,13 @@
                     if (ahc_linux_register_host(ahc, template) == 0)
                             found++;
             }
    +out:
    +
     #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
             spin_lock_irq(&io_request_lock);
     #endif
             aic7xxx_detect_complete++;
     
    -out:
             return (found);
     }
     
    @@ -5078,7 +5071,7 @@
             }
     }
     
    -static void __exit ahc_linux_exit(void);
    +static void ahc_linux_exit(void);
     
     static int __init
     ahc_linux_init(void)
    @@ -5101,7 +5094,7 @@
     #endif
     }
     
    -static void __exit
    +static void
     ahc_linux_exit(void)
     {
             struct ahc_softc *ahc;
    @@ -5128,12 +5121,8 @@
              */
             scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template);
     #endif
    -#ifdef CONFIG_PCI
             ahc_linux_pci_exit();
    -#endif
    -#ifdef CONFIG_EISA
             ahc_linux_eisa_exit();
    -#endif
     }
     
     module_init(ahc_linux_init);
    ===== aic7xxx_osm.h 1.52 vs edited =====
    --- 1.52/drivers/scsi/aic7xxx/aic7xxx_osm.h Tue Apr 6 23:09:31 2004
    +++ edited/aic7xxx_osm.h Thu Apr 29 20:39:50 2004
    @@ -845,6 +845,12 @@
     int aic7770_map_registers(struct ahc_softc *ahc,
                                                    u_int port);
     int aic7770_map_int(struct ahc_softc *ahc, u_int irq);
    +#else
    +static inline int ahc_linux_eisa_init(void) {
    + return -ENODEV;
    +}
    +static inline void ahc_linux_eisa_exit(void) {
    +}
     #endif
     
     /******************************* PCI Routines *********************************/
    @@ -931,6 +937,12 @@
     ahc_get_pci_bus(ahc_dev_softc_t pci)
     {
             return (pci->bus->number);
    +}
    +#else
    +static inline int ahc_linux_pci_init(void) {
    + return -ENODEV;
    +}
    +static inline void ahc_linux_pci_exit(void) {
     }
     #endif
     

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Art Haas: "Problem with recent changes to fs/dcache.c"

    Relevant Pages