CVS commit: src/sys/dev/scsipi

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Sun May 15 15:37:38 UTC 2016

Modified Files:
        src/sys/dev/scsipi: cd.c

Log Message:
Use _align(2) workaround for PR kern/51141. This fixes odd CD length
reporting.


To generate a diff of this commit:
cvs rdiff -u -r1.330 -r1.331 src/sys/dev/scsipi/cd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.330 src/sys/dev/scsipi/cd.c:1.331
--- src/sys/dev/scsipi/cd.c:1.330	Sun Apr 26 15:15:20 2015
+++ src/sys/dev/scsipi/cd.c	Sun May 15 15:37:38 2016
@@ -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 *p
 	 */
 	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 *pe
 	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 *p
 		 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;