Module Name: src Committed By: christos Date: Mon May 13 15:40:31 UTC 2013
Modified Files: src/sys/arch/hpc/hpc: disksubr.c Log Message: fix lossage from disklabel.h merge To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpc/hpc/disksubr.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/arch/hpc/hpc/disksubr.c diff -u src/sys/arch/hpc/hpc/disksubr.c:1.20 src/sys/arch/hpc/hpc/disksubr.c:1.21 --- src/sys/arch/hpc/hpc/disksubr.c:1.20 Wed Jan 2 06:48:25 2008 +++ src/sys/arch/hpc/hpc/disksubr.c Mon May 13 11:40:31 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:25 ad Exp $ */ +/* $NetBSD: disksubr.c,v 1.21 2013/05/13 15:40:31 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:25 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.21 2013/05/13 15:40:31 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -165,7 +165,7 @@ readdisklabel(dev_t dev, void (*strat)(s cyl = LABELSECTOR / lp->d_secpercyl; if (!osdep) goto nombrpart; - dp = osdep->dosparts; + dp = osdep->mbrparts; /* read master boot record */ bp->b_blkno = MBR_BBSECTOR; @@ -386,7 +386,7 @@ writedisklabel(dev_t dev, void (*strat)( cyl = LABELSECTOR / lp->d_secpercyl; if (!osdep) goto nombrpart; - dp = osdep->dosparts; + dp = osdep->mbrparts; /* read master boot record */ bp->b_blkno = MBR_BBSECTOR;