From: krw <krw@openbsd.org>
Date: Fri, 14 Oct 2022 13:22:57 +0000 (+0000)
Subject: No point in luna88k setting D_VENDOR since all actual uses are
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f2d2265f9f0e77eb20d09085f42f6136eb65080f;p=openbsd

No point in luna88k setting D_VENDOR since all actual uses are
inside #ifdef SUN_CYLCHECK or #ifdef SUN_AAT0 blocks in
disklabel(8), neither of which are defined for luna88k.

ok miod@
---

diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index ce22593f0a7..3e85e40adcf 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.61 2022/10/11 23:39:07 krw Exp $ */
+/* $OpenBSD: disksubr.c,v 1.62 2022/10/14 13:22:57 krw Exp $ */
 /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
 
 /*
@@ -110,7 +110,6 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *),
 
 	if ((error = initdisklabel(lp)))
 		goto done;
-	lp->d_flags |= D_VENDOR;
 
 	/* get a buffer and initialize it */
 	bp = geteblk(lp->d_secsize);
@@ -258,7 +257,6 @@ disklabel_om_to_bsd(dev_t dev, struct sun_disklabel *sl, struct disklabel *lp)
 	/* Format conversion. */
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
-	lp->d_flags = D_VENDOR;
 	memcpy(lp->d_packname, sl->sl_text, sizeof(lp->d_packname));
 
 	lp->d_secsize = DEV_BSIZE;
diff --git a/sys/arch/luna88k/stand/boot/ufs_disksubr.c b/sys/arch/luna88k/stand/boot/ufs_disksubr.c
index c146eb47158..80e0ef8113f 100644
--- a/sys/arch/luna88k/stand/boot/ufs_disksubr.c
+++ b/sys/arch/luna88k/stand/boot/ufs_disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_disksubr.c,v 1.5 2022/09/01 13:45:26 krw Exp $	*/
+/*	$OpenBSD: ufs_disksubr.c,v 1.6 2022/10/14 13:22:57 krw Exp $	*/
 /*	$NetBSD: ufs_disksubr.c,v 1.2 2013/01/14 01:37:57 tsutsui Exp $	*/
 
 /*
@@ -149,7 +149,6 @@ readdisklabel(struct scsi_softc *sc, uint tgt, struct disklabel *lp)
 
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
-	lp->d_flags = D_VENDOR;
 	memcpy(lp->d_packname, slp->sl_text, sizeof(lp->d_packname));
 	lp->d_nsectors = slp->sl_nsectors;
 	lp->d_ntracks = slp->sl_ntracks;