Correctly enable highmem_io option in 2.5.X.

Daemonize the kernel threads used for domain validation.

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 8fb69cd8f90ff08c13b0d53041da8f921c2bf8bc..e812bf2f73061b84d60e8d2f792c34912ed82714 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC79xx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#100 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#101 $
  *
  * --------------------------------------------------------------------------
  * Copyright (c) 1994-2000 Justin T. Gibbs.
@@ -1339,7 +1339,7 @@ Scsi_Host_Template aic79xx_driver_template = {
         */
        .max_sectors            = 8192,
 #endif
-#if defined CONFIG_HIGHIO
+#if defined CONFIG_HIGHIO || LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
 /* Assume RedHat Distribution with its different HIGHIO conventions. */
        .can_dma_32             = 1,
@@ -2486,6 +2486,14 @@ ahd_linux_dv_thread(void *data)
                printf("In DV Thread\n");
 #endif
 
+       /*
+        * Complete thread creation.
+        */
+       lock_kernel();
+       daemonize();
+       sprintf(current->comm, "ahd_dv_%d", ahd->unit);
+       unlock_kernel();
+
        while (1) {
                down(&ahd->platform_data->dv_sem);
 

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 46d34b111c532d6c1eddcdda58b0d5a09d51d169..2aed30d80a24b6c3740a258324414dabf484bf12 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -36,7 +36,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#96 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#97 $
  *
  */
 #ifndef _AIC79XX_LINUX_H_
@@ -48,6 +48,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/smp_lock.h>
 #include <linux/version.h>
 #ifndef AHD_MODVERSION_FILE
 #define __NO_VERSION__

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 4a30106757b6389a8b08d3bd809188504d73e3af..2a24f8ca64009a217a177caf8edf1f470d2dc167 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1,7 +1,7 @@
 /*
  * Adaptec AIC7xxx device driver for Linux.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#163 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#164 $
  *
  * Copyright (c) 1994 John Aycock
  *   The University of Calgary Department of Computer Science.
@@ -1297,7 +1297,7 @@ Scsi_Host_Template aic7xxx_driver_template = {
         */
        .max_sectors            = 8192,
 #endif
-#if defined CONFIG_HIGHIO
+#if defined CONFIG_HIGHIO || LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
 /* Assume RedHat Distribution with its different HIGHIO conventions. */
        .can_dma_32             = 1,
@@ -2338,6 +2338,14 @@ ahc_linux_dv_thread(void *data)
                printf("Launching DV Thread\n");
 #endif
 
+       /*
+        * Complete thread creation.
+        */
+       lock_kernel();
+       daemonize();
+       sprintf(current->comm, "ahc_dv_%d", ahc->unit);
+       unlock_kernel();
+
        while (1) {
                down(&ahc->platform_data->dv_sem);
 
@@ -4375,6 +4383,17 @@ ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
                                memset(&cmd->sense_buffer[sense_size], 0,
                                       sizeof(cmd->sense_buffer) - sense_size);
                        cmd->result |= (DRIVER_SENSE << 24);
+#ifdef AHC_DEBUG
+                       if (ahc_debug & AHC_SHOW_SENSE) {
+                               int i;
+
+                               printf("Copied %d bytes of sense data:",
+                                      sense_size);
+                               for (i = 0; i < sense_size; i++)
+                                       printf(" 0x%x", cmd->sense_buffer[i]);
+                               printf("\n");
+                       }
+#endif
                }
                break;
        }

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 65ff6384a9a4e689cf265cee3f11b19a00b39a09..7c549176292dc41c8341d91a845bedb002ac6f0a 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -53,7 +53,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#111 $
+ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#112 $
  *
  */
 #ifndef _AIC7XXX_LINUX_H_
@@ -65,6 +65,7 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
+#include <linux/smp_lock.h>
 #include <linux/version.h>
 #ifndef AHC_MODVERSION_FILE
 #define __NO_VERSION__