diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:02:43 +0800 |
| commit | 241bca50dd1ae71a7cd7eebe579bd131bf986167 (patch) | |
| tree | f9d4af30aefba27b3c00074d935f8b5b01d54939 /include/linux/libata.h | |
| parent | 1ebca975cbc0ab4708126e26bf2729777184f1e6 (diff) | |
| parent | 5cc3b58828a8bb2ebb34de96d1aec1564f912a31 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.03-android
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 e0e33787c485..11c2dd114732 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -717,7 +717,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]; |