[src/netbsd-6]: src/sys/arch/x68k/dev Pull up following revision(s) (requeste...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/df6fa1e3f0f9
branches:  netbsd-6
changeset: 775363:df6fa1e3f0f9
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Oct 17 22:26:05 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #601):
        sys/arch/x68k/dev/mha.c: revision 1.53
Fix device_t/softc split botches that could be fatal.  From
Chuck Silvers' patch posted current-users and tech-kern:
http://mail-index.netbsd.org/current-users/2012/10/09/msg021233.html
Should be pulled up to netbsd-6.

diffstat:

 sys/arch/x68k/dev/mha.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a7da16579419 -r df6fa1e3f0f9 sys/arch/x68k/dev/mha.c
--- a/sys/arch/x68k/dev/mha.c   Wed Oct 17 22:21:07 2012 +0000
+++ b/sys/arch/x68k/dev/mha.c   Wed Oct 17 22:26:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mha.c,v 1.52 2009/11/23 00:11:45 rmind Exp $   */
+/*     $NetBSD: mha.c,v 1.52.18.1 2012/10/17 22:26:05 riz Exp $        */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.52 2009/11/23 00:11:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.52.18.1 2012/10/17 22:26:05 riz Exp $");
 
 #include "opt_ddb.h"
 
@@ -337,7 +337,7 @@
        /*
         * Fill in the adapter.
         */
-       sc->sc_adapter.adapt_dev = sc->sc_dev;
+       sc->sc_adapter.adapt_dev = self;
        sc->sc_adapter.adapt_nchannels = 1;
        sc->sc_adapter.adapt_openings = 7;
        sc->sc_adapter.adapt_max_periph = 1;
@@ -674,7 +674,7 @@
 {
        struct scsipi_xfer *xs;
        struct scsipi_periph *periph;
-       struct mha_softc *sc = (void *)chan->chan_adapter->adapt_dev;
+       struct mha_softc *sc = device_private(chan->chan_adapter->adapt_dev);
        struct acb *acb;
        int s, flags;
 
@@ -1949,7 +1949,7 @@
        struct scsipi_xfer *xs = acb->xs;
        struct scsipi_periph *periph = xs->xs_periph;
        struct mha_softc *sc =
-           (void *)periph->periph_channel->chan_adapter->adapt_dev;
+           device_private(periph->periph_channel->chan_adapter->adapt_dev);
        int s;
 
        s = splbio();