From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 May 2008 20:52:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.26-rc1~9
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d626e3bf728c47746f2129aa00c775d4e8c2a73b;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
  [SCSI] aic94xx: fix section mismatch
  [SCSI] u14-34f: Fix 32bit only problem
  [SCSI] dpt_i2o: sysfs code
  [SCSI] dpt_i2o: 64 bit support
  [SCSI] dpt_i2o: move from virt_to_bus/bus_to_virt to dma_alloc_coherent
  [SCSI] dpt_i2o: use standard __init / __exit code
  [SCSI] megaraid_sas: fix suspend/resume sections
  [SCSI] aacraid: Add Power Management support
  [SCSI] aacraid: Fix jbod operations scan issues
  [SCSI] aacraid: Fix warning about macro side-effects
  [SCSI] add support for variable length extended commands
  [SCSI] Let scsi_cmnd->cmnd use request->cmd buffer
  [SCSI] bsg: add large command support
  [SCSI] aacraid: Fix down_interruptible() to check the return value correctly
  [SCSI] megaraid_sas; Update the Version and Changelog
  [SCSI] ibmvscsi: Handle non SCSI error status
  [SCSI] bug fix for free list handling
  [SCSI] ipr: Rename ipr's state scsi host attribute to prevent collisions
  [SCSI] megaraid_mbox: fix Dell CERC firmware problem
---

d626e3bf728c47746f2129aa00c775d4e8c2a73b
diff --cc drivers/scsi/dpt_i2o.c
index ac92ac143b4,8939fbf102f..0fb5bf4c43a
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@@ -151,9 -147,24 +147,24 @@@ static DEFINE_SPINLOCK(adpt_post_wait_l
   *============================================================================
   */
  
+ static inline int dpt_dma64(adpt_hba *pHba)
+ {
+ 	return (sizeof(dma_addr_t) > 4 && (pHba)->dma64);
+ }
+ 
+ static inline u32 dma_high(dma_addr_t addr)
+ {
+ 	return upper_32_bits(addr);
+ }
+ 
+ static inline u32 dma_low(dma_addr_t addr)
+ {
+ 	return (u32)addr;
+ }
+ 
  static u8 adpt_read_blink_led(adpt_hba* host)
  {
 -	if(host->FwDebugBLEDflag_P != 0) {
 +	if (host->FwDebugBLEDflag_P) {
  		if( readb(host->FwDebugBLEDflag_P) == 0xbc ){
  			return readb(host->FwDebugBLEDvalue_P);
  		}