[src/trunk]: src/sys/arch/macppc Reverting.

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

details:   https://anonhg.NetBSD.org/src/rev/ae79cea6b910
branches:  trunk
changeset: 571024:ae79cea6b910
user:      mbw <mbw%NetBSD.org@localhost>
date:      Mon Nov 08 17:36:07 2004 +0000

description:
Reverting.
Apparently these patches cause problems.

diffstat:

 sys/arch/macppc/include/disklabel.h |  3 +--
 sys/arch/macppc/macppc/disksubr.c   |  6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 4c2231c4dd6a -r ae79cea6b910 sys/arch/macppc/include/disklabel.h
--- a/sys/arch/macppc/include/disklabel.h       Mon Nov 08 17:05:37 2004 +0000
+++ b/sys/arch/macppc/include/disklabel.h       Mon Nov 08 17:36:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.h,v 1.12 2004/11/07 04:24:34 mbw Exp $       */
+/*     $NetBSD: disklabel.h,v 1.13 2004/11/08 17:36:07 mbw Exp $       */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -220,7 +220,6 @@
 #define BZB_TYPEFS     1
 #define BZB_TYPESWAP   3
 #define BZB_ROOTFS     0x8000
-#define BZB_ROOTFS_NEW 0xc000
 #define BZB_USRFS      0x4000
 #define BZB_USRFS_NEW  0x0004
 
diff -r 4c2231c4dd6a -r ae79cea6b910 sys/arch/macppc/macppc/disksubr.c
--- a/sys/arch/macppc/macppc/disksubr.c Mon Nov 08 17:05:37 2004 +0000
+++ b/sys/arch/macppc/macppc/disksubr.c Mon Nov 08 17:36:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.33 2004/11/07 04:24:33 mbw Exp $        */
+/*     $NetBSD: disksubr.c,v 1.34 2004/11/08 17:36:07 mbw Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -106,7 +106,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.33 2004/11/07 04:24:33 mbw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.34 2004/11/08 17:36:07 mbw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -215,7 +215,7 @@
                *clust = bzb->bzbCluster;
                if (bzb->bzbMagic != BZB_MAGIC) {
                        type = 0;
-               } else if (bzb->bzbFlags & (BZB_ROOTFS | BZB_ROOTFS_NEW)) {
+               } else if (bzb->bzbFlags & BZB_ROOTFS) {
                        type = ROOT_PART;
                        *fstype = FS_BSDFFS;
                } else if (bzb->bzbFlags & (BZB_USRFS | BZB_USRFS_NEW)) {