Module Name: src
Committed By: riz
Date: Sun Mar 31 20:36:23 UTC 2013
Modified Files:
src/sys/dev/mscp [netbsd-6]: mscp_subr.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #857):
sys/dev/mscp/mscp_subr.c: revision 1.45
Fix device_t split glitch
To generate a diff of this commit:
cvs rdiff -u -r1.41.18.2 -r1.41.18.3 src/sys/dev/mscp/mscp_subr.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/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.41.18.2 src/sys/dev/mscp/mscp_subr.c:1.41.18.3
--- src/sys/dev/mscp/mscp_subr.c:1.41.18.2 Thu Jul 12 17:17:27 2012
+++ src/sys/dev/mscp/mscp_subr.c Sun Mar 31 20:36:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.41.18.2 2012/07/12 17:17:27 riz Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.41.18.3 2013/03/31 20:36:23 riz Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.41.18.2 2012/07/12 17:17:27 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.41.18.3 2013/03/31 20:36:23 riz Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -549,7 +549,7 @@ mscp_print(void *aux, const char *name)
void
mscp_strategy(struct buf *bp, device_t usc)
{
- struct mscp_softc *mi = (void *)usc;
+ struct mscp_softc *mi = device_private(usc);
int s = spluba();
bufq_put(mi->mi_resq, bp);
