diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-07-10 16:16:09 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-07-10 16:16:09 +0000 |
| commit | 70c27f81536384a69be4f381d04b2fb81efb4803 (patch) | |
| tree | 7b5e05957d7fd8802812eaa882c2d12fbf1c0b53 /sys/arch | |
| parent | ff9a38466396b471778b3c31fdc1c44687c9f1fb (diff) | |
Oops. Copy just the comment about the checkdisklabel() call, not
the checkdisklabel() calls themselves. What's good for hppa/hppa64
is not necessarily good for sgi/macppc.
Spotted by deraadt@.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/macppc/macppc/disksubr.c | 5 | ||||
| -rw-r--r-- | sys/arch/sgi/sgi/disksubr.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c index 7e4df923049..df9787301ce 100644 --- a/sys/arch/macppc/macppc/disksubr.c +++ b/sys/arch/macppc/macppc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.76 2011/07/10 04:49:39 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.77 2011/07/10 16:16:08 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -190,8 +190,7 @@ readdpmelabel(struct buf *bp, void (*strat)(struct buf *), * disklabel for this dpme disk. DO NOT proceed to readdoslabel(), * iso_spooflabel(), * etc. */ - checkdisklabel(bp->b_data + LABELOFFSET, lp, openbsdstart, - DL_GETDSIZE(lp)); + checkdisklabel(bp->b_data + LABELOFFSET, lp, hfspartoff, hfspartend); return (0); } diff --git a/sys/arch/sgi/sgi/disksubr.c b/sys/arch/sgi/sgi/disksubr.c index 3c99259f314..18c33ca13eb 100644 --- a/sys/arch/sgi/sgi/disksubr.c +++ b/sys/arch/sgi/sgi/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.25 2011/07/10 04:49:39 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.26 2011/07/10 16:16:08 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -213,8 +213,7 @@ finished: * OpenBSD disklabel for this sgi disk. DO NOT proceed to * readdoslabel(), iso_spooflabel(), etc. */ - checkdisklabel(bp->b_data + LABELOFFSET, lp, openbsdstart, - DL_GETDSIZE(lp)); + checkdisklabel(bp->b_data + offset, lp, fsoffs, fsend); return (0); } |