rr231x_0x/scsi_lck.patch

   1 diff -Naur src/rr231x_0x-linux-src-v2.5/osm/linux/os_linux.c src/rr231x_0x-linux-src-v2.5.new/osm/linux/os_linux.c
   2 --- src/rr231x_0x-linux-src-v2.5/osm/linux/os_linux.c   2009-07-16 03:28:28.000000000 +0200
   3 +++ src/rr231x_0x-linux-src-v2.5.new/osm/linux/os_linux.c       2011-06-08 13:33:58.100186383 +0200
   4 @@ -260,7 +260,11 @@
   5                                         struct block_device *bdev = bdget(MKDEV(major[i], minor));
   6                                         if (bdev &&
   7  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
   8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
   9 +                                               blkdev_get(bdev, FMODE_READ, NULL)
  10 +#else
  11                                                 blkdev_get(bdev, FMODE_READ)
  12 +#endif
  13  #else
  14                                                 blkdev_get(bdev, FMODE_READ, 0 __BDEV_RAW)
  15  #endif
  16 diff -Naur src/rr231x_0x-linux-src-v2.5/osm/linux/osm_linux.c src/rr231x_0x-linux-src-v2.5.new/osm/linux/osm_linux.c
  17 --- src/rr231x_0x-linux-src-v2.5/osm/linux/osm_linux.c  2009-07-16 03:28:28.000000000 +0200
  18 +++ src/rr231x_0x-linux-src-v2.5.new/osm/linux/osm_linux.c      2011-06-08 13:34:00.068212729 +0200
  19 @@ -874,7 +874,7 @@
  20         }
  21  }
  22
  23 -static int hpt_queuecommand (Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
  24 +static int hpt_queuecommand_lck (Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
  25  {
  26         struct Scsi_Host *phost = sc_host(SCpnt);
  27         PVBUS_EXT vbus_ext = get_vbus_ext(phost);
  28 @@ -1408,6 +1408,12 @@
  29         return 0;
  30  }
  31
  32 +#ifdef DEF_SCSI_QCMD
  33 +DEF_SCSI_QCMD(hpt_queuecommand)
  34 +#else
  35 +#define hpt_queuecommand hpt_queuecommand_lck
  36 +#endif
  37 +
  38  static int hpt_reset (Scsi_Cmnd *SCpnt)
  39  {
  40         PVBUS_EXT vbus_ext = get_vbus_ext(sc_host(SCpnt));
  41 diff -Naur src/rr231x_0x-linux-src-v2.5/osm/linux/osm_linux.h src/rr231x_0x-linux-src-v2.5.new/osm/linux/osm_linux.h
  42 --- src/rr231x_0x-linux-src-v2.5/osm/linux/osm_linux.h  2009-07-16 03:28:28.000000000 +0200
  43 +++ src/rr231x_0x-linux-src-v2.5.new/osm/linux/osm_linux.h      2011-06-08 13:34:00.880223582 +0200
  44 @@ -8,10 +8,6 @@
  45
  46  /* system headers */
  47
  48 -#ifndef AUTOCONF_INCLUDED
  49 -#include <linux/config.h>
  50 -#endif
  51 -
  52  #include <linux/version.h>
  53
  54  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) && defined(MODVERSIONS)
  55