diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:22:01 -0700 |
| commit | 83d5a325107cd0befa2b863e795675bc8ff881d7 (patch) | |
| tree | 64cd1a69d726b19e70783f2b350baf3f8aa38489 /include/linux | |
| parent | d0cdb070ced5453fd1790d83c32bdc59d8ff9375 (diff) | |
| parent | 968e594afdbc40b4270f9d4032ae8350475749d6 (diff) | |
| download | blackbird-op-linux-83d5a325107cd0befa2b863e795675bc8ff881d7.tar.gz blackbird-op-linux-83d5a325107cd0befa2b863e795675bc8ff881d7.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Don't trust current capacity values in identify words 57-58
libata: make sure port is thawed when skipping resets
sata_nv: fix module parameter description
ahci: Add the Device IDs for MCP89 and remove IDs of MCP7B to/from ahci.c
libata: don't use on-stack sense buffer
libata: align ap->sector_buf
libata: fix dma_unmap_sg misuse
libata: change drive ready wait after hard reset to 5s
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/libata.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 5d87bc09a1f5..dc18b87ed722 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -275,7 +275,7 @@ enum { * advised to wait only for the following duration before * doing SRST. */ - ATA_TMOUT_PMP_SRST_WAIT = 1000, + ATA_TMOUT_PMP_SRST_WAIT = 5000, /* ATA bus states */ BUS_UNKNOWN = 0, @@ -530,6 +530,7 @@ struct ata_queued_cmd { unsigned long flags; /* ATA_QCFLAG_xxx */ unsigned int tag; unsigned int n_elem; + unsigned int orig_n_elem; int dma_dir; @@ -750,7 +751,8 @@ struct ata_port { acpi_handle acpi_handle; struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ #endif - u8 sector_buf[ATA_SECT_SIZE]; /* owned by EH */ + /* owned by EH */ + u8 sector_buf[ATA_SECT_SIZE] ____cacheline_aligned; }; /* The following initializer overrides a method to NULL whether one of |
