Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/sys/arch/amiga/amiga Pull up following revision(s) (reque...



details:   https://anonhg.NetBSD.org/src/rev/9e687c095bfc
branches:  netbsd-7
changeset: 799421:9e687c095bfc
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Jun 08 20:46:29 2015 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #832):
        sys/arch/amiga/amiga/autoconf.c: revision 1.117
use RAW_PART to trigger read of disklabel, other units might by busy due
to discovered wedges.

diffstat:

 sys/arch/amiga/amiga/autoconf.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 468bd38c36cd -r 9e687c095bfc sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c   Mon Jun 08 20:33:19 2015 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c   Mon Jun 08 20:46:29 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $   */
+/*     $NetBSD: autoconf.c,v 1.116.4.1 2015/06/08 20:46:29 snj Exp $   */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.116.4.1 2015/06/08 20:46:29 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,11 +481,11 @@
                        maj = bdevsw_lookup_major(bdp);
 
                        /* Open disk; forces read of disklabel. */
-                       if ((*bdp->d_open)(MAKEDISKDEV(maj,
-                           unit, 0), FREAD|FNONBLOCK, 0, &lwp0))
+                       if ((*bdp->d_open)(MAKEDISKDEV(maj, unit, RAW_PART),
+                               FREAD|FNONBLOCK, 0, &lwp0))
                                continue;
-                       (void)(*bdp->d_close)(MAKEDISKDEV(maj,
-                           unit, 0), FREAD|FNONBLOCK, 0, &lwp0);
+                       (void)(*bdp->d_close)(MAKEDISKDEV(maj, unit, RAW_PART),
+                               FREAD|FNONBLOCK, 0, &lwp0);
 
                        pp = &dkp->dk_label->d_partitions[0];
                        if (pp->p_size != 0 && pp->p_fstype == FS_BSDFFS) {



Home | Main Index | Thread Index | Old Index