Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: (63 commits)
  Fix memory leak in dm-crypt
  SPARC64: sg chaining support
  SPARC: sg chaining support
  PPC: sg chaining support
  PS3: sg chaining support
  IA64: sg chaining support
  x86-64: enable sg chaining
  x86-64: update pci-gart iommu to sg helpers
  x86-64: update nommu to sg helpers
  x86-64: update calgary iommu to sg helpers
  swiotlb: sg chaining support
  i386: enable sg chaining
  i386 dma_map_sg: convert to using sg helpers
  mmc: need to zero sglist on init
  Panic in blk_rq_map_sg() from CCISS driver
  remove sglist_len
  remove blk_queue_max_phys_segments in libata
  revert sg segment size ifdefs
  Fixup u14-34f ENABLE_SG_CHAINING
  qla1280: enable use_sg_chaining option
  ...

1 files changed, 2 insertions, 36 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 4cece930114c..04273d3c147c 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -322,41 +322,6 @@ static void ide_complete_pm_request (ide_drive_t *drive, struct request *rq)
         spin_unlock_irqrestore(&ide_lock, flags);
 }
 
-/*
- * FIXME: probably move this somewhere else, name is bad too :)
- */
-u64 ide_get_error_location(ide_drive_t *drive, char *args)
-{
-        u32 high, low;
-        u8 hcyl, lcyl, sect;
-        u64 sector;
-
-        high = 0;
-        hcyl = args[5];
-        lcyl = args[4];
-        sect = args[3];
-
-        if (ide_id_has_flush_cache_ext(drive->id)) {
-                low = (hcyl << 16) | (lcyl << 8) | sect;
-                HWIF(drive)->OUTB(drive->ctl|0x80, IDE_CONTROL_REG);
-                high = ide_read_24(drive);
-        } else {
-                u8 cur = HWIF(drive)->INB(IDE_SELECT_REG);
-                if (cur & 0x40) {
-                        high = cur & 0xf;
-                        low = (hcyl << 16) | (lcyl << 8) | sect;
-                } else {
-                        low = hcyl * drive->head * drive->sect;
-                        low += lcyl * drive->sect;
-                        low += sect - 1;
-                }
-        }
-
-        sector = ((u64) high << 24) | low;
-        return sector;
-}
-EXPORT_SYMBOL(ide_get_error_location);
-
 /**
  *      ide_end_drive_cmd       -       end an explicit drive command
  *      @drive: command 
@@ -881,7 +846,8 @@ void ide_init_sg_cmd(ide_drive_t *drive, struct request *rq)
         ide_hwif_t *hwif = drive->hwif;
 
         hwif->nsect = hwif->nleft = rq->nr_sectors;
-        hwif->cursg = hwif->cursg_ofs = 0;
+        hwif->cursg_ofs = 0;
+        hwif->cursg = NULL;
 }
 
 EXPORT_SYMBOL_GPL(ide_init_sg_cmd);