diff options
| author | Tejun Heo <tj@kernel.org> | 2016-03-11 12:30:17 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-03-11 12:30:17 -0500 |
| commit | fe6c58146d42785386ca69bb1e35d53ac5940cb7 (patch) | |
| tree | be4006ac033d638071f65851403c42b382b23427 /include/linux/libata.h | |
| parent | 51b1b2867b81450bd198b691c70dccb582e961ff (diff) | |
| parent | dc8b4afc4a04fac8ee55a19b59f2356a25e7e778 (diff) | |
Merge branch 'for-4.5-fixes' into for-4.6
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index bec2abbd7ab2..2c4ebef79d0c 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -720,7 +720,7 @@ struct ata_device { union { u16 id[ATA_ID_WORDS]; /* IDENTIFY xxx DEVICE data */ u32 gscr[SATA_PMP_GSCR_DWORDS]; /* PMP GSCR block */ - }; + } ____cacheline_aligned; /* DEVSLP Timing Variables from Identify Device Data Log */ u8 devslp_timing[ATA_LOG_DEVSLP_SIZE]; |