sorry. correct patch:
2017-07-28 23:52 GMT+03:00 Андрей Болконский <[email protected]>:
> This header not used since retire sparc.
> build amd64 is ok
>
>
> *diff -ruN src/sys/ddb/db_structinfo.c mysrc/sys/ddb/db_structinfo.c*
> *--- src/sys/ddb/db_structinfo.c 2017-07-27 23:55:18.744698016 +0300*
> *+++ mysrc/sys/ddb/db_structinfo.c 2017-07-28 00:36:10.241963162 +0300*
> *@@ -1,5 +1,6 @@*
> * /* $OpenBSD: db_structinfo.c,v 1.15 2017/05/30 18:37:19 bluhm Exp $ */*
> * /* public domain */*
> *+*
> * /**
> * * This file is intended to be compiled with debug information,*
> * * which is then translated by parse_debug.awk into support data*
> *@@ -18,7 +19,6 @@*
> * #include <sys/disk.h>*
> * #include <sys/disklabel.h>*
> * #include <sys/dirent.h>*
> *-#include <sys/dkbad.h>*
> * #include <sys/evcount.h>*
> * #include <sys/event.h>*
> * #include <sys/eventvar.h>*
> *diff -ruN src/sys/sys/dkbad.h mysrc/sys/sys/dkbad.h*
> *--- src/sys/sys/dkbad.h 2017-07-27 23:55:34.704847786 +0300*
> *+++ mysrc/sys/sys/dkbad.h 1970-01-01 03:00:00.000000000 +0300*
> *@@ -1,74 +0,0 @@*
> *-/* $OpenBSD: dkbad.h,v 1.4 2003/06/02 23:28:21 millert Exp $ */*
> *-/* $NetBSD: dkbad.h,v 1.10 1994/12/25 13:14:21 pk Exp $ */*
> *-*
> *-/*-*
> *- * Copyright (c) 1982, 1986, 1993, 1994*
> *- * The Regents of the University of California. All rights reserved.*
> *- **
> *- * Redistribution and use in source and binary forms, with or without*
> *- * modification, are permitted provided that the following conditions*
> *- * are met:*
> *- * 1. Redistributions of source code must retain the above copyright*
> *- * notice, this list of conditions and the following disclaimer.*
> *- * 2. Redistributions in binary form must reproduce the above copyright*
> *- * notice, this list of conditions and the following disclaimer in
> the*
> *- * documentation and/or other materials provided with the
> distribution.*
> *- * 3. Neither the name of the University nor the names of its
> contributors*
> *- * may be used to endorse or promote products derived from this
> software*
> *- * without specific prior written permission.*
> *- **
> *- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS''
> AND*
> *- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE*
> *- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
> PURPOSE*
> *- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
> LIABLE*
> *- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> CONSEQUENTIAL*
> *- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
> GOODS*
> *- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)*
> *- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
> STRICT*
> *- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
> WAY*
> *- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
> OF*
> *- * SUCH DAMAGE.*
> *- **
> *- * @(#)dkbad.h 8.2 (Berkeley) 7/10/94*
> *- */*
> *-*
> *-#ifndef _SYS_DKBAD_H_*
> *-#define _SYS_DKBAD_H_*
> *-*
> *-/**
> *- * Definitions needed to perform bad sector revectoring ala DEC STD 144.*
> *- **
> *- * The bad sector information is located in the first 5 even numbered*
> *- * sectors of the last track of the disk pack. There are five identical*
> *- * copies of the information, described by the dkbad structure.*
> *- **
> *- * Replacement sectors are allocated starting with the first sector
> before*
> *- * the bad sector information and working backwards towards the
> beginning of*
> *- * the disk. A maximum of 126 bad sectors are supported. The position
> of*
> *- * the bad sector in the bad sector table determines which replacement
> sector*
> *- * it corresponds to.*
> *- **
> *- * The bad sector information and replacement sectors are conventionally*
> *- * only accessible through the 'c' file system partition of the disk.
> If*
> *- * that partition is used for a file system, the user is responsible for*
> *- * making sure that it does not overlap the bad sector information or
> any*
> *- * replacement sectors.*
> *- */*
> *-#define NBT_BAD 126*
> *-*
> *-struct dkbad {*
> *- int32_t bt_csn; /* cartridge serial number */*
> *- u_int16_t bt_mbz; /* unused; should be 0 */*
> *- u_int16_t bt_flag; /* -1 => alignment cartridge */*
> *- struct bt_bad {*
> *- u_int16_t bt_cyl; /* cylinder number of bad sector */*
> *- u_int16_t bt_trksec; /* track and sector number */*
> *- } bt_bad[NBT_BAD];*
> *-};*
> *-*
> *-#define ECC 0*
> *-#define SSE 1*
> *-#define BSE 2*
> *-#define CONT 3*
> *-*
> *-#endif /* _SYS_DKBAD_H_ */*
> *diff -ruN src/sys/sys/dkio.h mysrc/sys/sys/dkio.h*
> *--- src/sys/sys/dkio.h 2017-07-27 23:55:34.704847786 +0300*
> *+++ mysrc/sys/sys/dkio.h 2017-07-28 00:31:11.939262144 +0300*
> *@@ -51,7 +51,6 @@*
> * #define DIOCSSTEP _IOW('d', 107, int) /* set step rate */*
> * #define DIOCSRETRIES _IOW('d', 108, int) /* set # of retries */*
>
> *-#define DIOCSBAD _IOW('d', 110, struct dkbad) /* set kernel dkbad */*
> * #define DIOCEJECT _IO('d', 112) /* eject removable disk */*
> * #define DIOCLOCK _IOW('d', 113, int) /* lock/unlock pack */*
>
> *diff -ruN src/usr.bin/kdump/mkioctls mysrc/usr.bin/kdump/mkioctls*
> *--- src/usr.bin/kdump/mkioctls 2017-07-27 23:55:37.784867156 +0300*
> *+++ mysrc/usr.bin/kdump/mkioctls 2017-07-28 00:33:44.010632750 +0300*
> *@@ -65,7 +65,6 @@*
> * print "#include <sys/cdio.h>"*
> * print "#include <sys/chio.h>"*
> * print "#include <sys/disk.h>"*
> *- print "#include <sys/dkbad.h>"*
> * print "#include <sys/dkio.h>"*
> * print "#include <sys/filio.h>"*
> * print "#include <sys/gpio.h>"*
>
>
? sys/ddb/db_structinfo.txt
Index: sys/ddb/db_structinfo.c
===================================================================
RCS file: /cvs/src/sys/ddb/db_structinfo.c,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 db_structinfo.c
--- sys/ddb/db_structinfo.c 30 May 2017 18:37:19 -0000 1.15
+++ sys/ddb/db_structinfo.c 28 Jul 2017 23:03:20 -0000
@@ -18,7 +18,6 @@
#include <sys/disk.h>
#include <sys/disklabel.h>
#include <sys/dirent.h>
-#include <sys/dkbad.h>
#include <sys/evcount.h>
#include <sys/event.h>
#include <sys/eventvar.h>
Index: sys/sys/dkbad.h
===================================================================
RCS file: sys/sys/dkbad.h
diff -N sys/sys/dkbad.h
--- sys/sys/dkbad.h 2 Jun 2003 23:28:21 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-/* $OpenBSD: dkbad.h,v 1.4 2003/06/02 23:28:21 millert Exp $ */
-/* $NetBSD: dkbad.h,v 1.10 1994/12/25 13:14:21 pk Exp $ */
-
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)dkbad.h 8.2 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_DKBAD_H_
-#define _SYS_DKBAD_H_
-
-/*
- * Definitions needed to perform bad sector revectoring ala DEC STD 144.
- *
- * The bad sector information is located in the first 5 even numbered
- * sectors of the last track of the disk pack. There are five identical
- * copies of the information, described by the dkbad structure.
- *
- * Replacement sectors are allocated starting with the first sector before
- * the bad sector information and working backwards towards the beginning of
- * the disk. A maximum of 126 bad sectors are supported. The position of
- * the bad sector in the bad sector table determines which replacement sector
- * it corresponds to.
- *
- * The bad sector information and replacement sectors are conventionally
- * only accessible through the 'c' file system partition of the disk. If
- * that partition is used for a file system, the user is responsible for
- * making sure that it does not overlap the bad sector information or any
- * replacement sectors.
- */
-#define NBT_BAD 126
-
-struct dkbad {
- int32_t bt_csn; /* cartridge serial number */
- u_int16_t bt_mbz; /* unused; should be 0 */
- u_int16_t bt_flag; /* -1 => alignment cartridge */
- struct bt_bad {
- u_int16_t bt_cyl; /* cylinder number of bad sector */
- u_int16_t bt_trksec; /* track and sector number */
- } bt_bad[NBT_BAD];
-};
-
-#define ECC 0
-#define SSE 1
-#define BSE 2
-#define CONT 3
-
-#endif /* _SYS_DKBAD_H_ */
Index: sys/sys/dkio.h
===================================================================
RCS file: /cvs/src/sys/sys/dkio.h,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 dkio.h
--- sys/sys/dkio.h 29 May 2017 14:05:31 -0000 1.10
+++ sys/sys/dkio.h 28 Jul 2017 23:03:22 -0000
@@ -51,7 +51,6 @@
#define DIOCSSTEP _IOW('d', 107, int) /* set step rate */
#define DIOCSRETRIES _IOW('d', 108, int) /* set # of retries */
-#define DIOCSBAD _IOW('d', 110, struct dkbad) /* set kernel dkbad */
#define DIOCEJECT _IO('d', 112) /* eject removable disk */
#define DIOCLOCK _IOW('d', 113, int) /* lock/unlock pack */
Index: usr.bin/kdump/mkioctls
===================================================================
RCS file: /cvs/src/usr.bin/kdump/mkioctls,v
retrieving revision 1.38
diff -u -p -u -p -r1.38 mkioctls
--- usr.bin/kdump/mkioctls 29 May 2017 13:30:35 -0000 1.38
+++ usr.bin/kdump/mkioctls 28 Jul 2017 23:03:22 -0000
@@ -65,7 +65,6 @@ BEGIN {
print "#include <sys/cdio.h>"
print "#include <sys/chio.h>"
print "#include <sys/disk.h>"
- print "#include <sys/dkbad.h>"
print "#include <sys/dkio.h>"
print "#include <sys/filio.h>"
print "#include <sys/gpio.h>"
