diff --git a/[refs] b/[refs] index bdc6757fa60a..78fe93734c89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5825627c9463581fd9e70f8285685889ae5bb9bb +refs/heads/master: 84bda12af31f930e4200c5244aa111de2485d7b0 diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index fbf064e13ad5..dc18b87ed722 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -751,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