From ad6b4a346fb05079ddbe1d03480aef54bf9471c9 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 18 Jul 2017 21:09:29 +0000
Subject: [PATCH] Remove special handling for 'disk*.h'

This was originally added so that only one of diskmbr.h or diskpc98.h
was chosen and is no longer needed after PC98's removal.  However, the
special handling was also broken as it effectively prevented the decoding
of ioctls declared in other headers such as <sys/disk.h> or
<sys/disklabel.h>.
---
 lib/libsysdecode/mkioctls | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/libsysdecode/mkioctls b/lib/libsysdecode/mkioctls
index e5bcee2338e..743029a24f2 100644
--- a/lib/libsysdecode/mkioctls
+++ b/lib/libsysdecode/mkioctls
@@ -18,14 +18,12 @@ LC_ALL=C; export LC_ALL
 ioctl_includes=$(
 	cd $includedir
 	find -H -s * -name '*.h' | \
-	egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \
+	egrep -v '(net/pfvar|net/if_pfsync)\.h' | \
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\n", $1)}'
 )
 
-ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
-
 awk -v x="$ioctl_includes" 'BEGIN {print x}' |
 	$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |
 	awk -v ioctl_includes="$ioctl_includes" '