diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /include/scsi/libsas.h | |
parent | macvlan: fix memory hole in macvlan_dev (diff) | |
parent | kmemcheck: rip it out for real (diff) | |
download | linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r-- | include/scsi/libsas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 0f9cbf96c093..6df6fe0c2198 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -159,11 +159,11 @@ struct expander_device { struct sata_device { unsigned int class; - struct smp_resp rps_resp; /* report_phy_sata_resp */ u8 port_no; /* port number, if this is a PM (Port) */ struct ata_port *ap; struct ata_host ata_host; + struct smp_resp rps_resp ____cacheline_aligned; /* report_phy_sata_resp */ u8 fis[ATA_RESP_FIS_SIZE]; }; |