summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorreinoud <reinoud@NetBSD.org>2016-05-15 15:37:38 +0000
committerreinoud <reinoud@NetBSD.org>2016-05-15 15:37:38 +0000
commit1f0cb70292bb899f08d08c8cc63df5ee0840c143 (patch)
treef67d5382249586af23d6429d5792cefe3b867d3c /sys
parent5f6e50e5850915fbbdc90be5b47c378a61728e18 (diff)
Use _align(2) workaround for PR kern/51141. This fixes odd CD length
reporting.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/scsipi/cd.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 0b7e18dfa22..793bdda80bc 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $ */
+/* $NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.330 2015/04/26 15:15:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.331 2016/05/15 15:37:38 reinoud Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1799,9 +1799,9 @@ read_cd_capacity(struct scsipi_periph *periph, uint32_t *blksize, u_long *last_l
*/
struct scsipi_read_cd_cap_data cap __aligned(2);
struct scsipi_read_discinfo di_cmd;
- struct scsipi_read_discinfo_data di;
+ struct scsipi_read_discinfo_data di __aligned(2);
struct scsipi_read_trackinfo ti_cmd;
- struct scsipi_read_trackinfo_data ti;
+ struct scsipi_read_trackinfo_data ti __aligned(2);
uint32_t track_start, track_size;
int error, flags, msb, lsb, last_track;
@@ -2986,7 +2986,7 @@ mmc_getdiscinfo(struct scsipi_periph *periph,
struct scsipi_get_conf_data *gc;
struct scsipi_get_conf_feature *gcf;
struct scsipi_read_discinfo di_cmd;
- struct scsipi_read_discinfo_data di;
+ struct scsipi_read_discinfo_data di __aligned(2);
const uint32_t buffer_size = 1024;
uint32_t feat_tbl_len, pos;
u_long last_lba = 0;
@@ -3502,9 +3502,9 @@ mmc_gettrackinfo(struct scsipi_periph *periph,
struct mmc_trackinfo *trackinfo)
{
struct scsipi_read_trackinfo ti_cmd;
- struct scsipi_read_trackinfo_data ti;
+ struct scsipi_read_trackinfo_data ti __aligned(2);
struct scsipi_get_configuration gc_cmd;
- struct scsipi_get_conf_data gc;
+ struct scsipi_get_conf_data gc __aligned(2);
int error, flags;
int mmc_profile;