--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

moin,

On Tue, Aug 29, 2006 at 12:47:07PM +0000, Christos Zoulas wrote:
> Please add "keep" lines to mkioctls and send us a patch:
> For the 2 conflicts you mention you need:
> 
> 	keep["OPIOGET"] = 1; # Same as OFIOGET
> 	keep["OPIOCGETNEXT"] = 1; # Same as OFIOCGETNEXT

Patch to mkioctls is attached. I didn't even see that the symbols
are *not* the same name... I've successfully compiled kdump now
with the patch. Thanks for the quick answer.

Regards,

-Martin

--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mkioctls.patch"

? mkioctls.patch
Index: mkioctls
===================================================================
RCS file: /cvsroot/src/usr.bin/kdump/mkioctls,v
retrieving revision 1.25
diff -u -r1.25 mkioctls
--- mkioctls	27 Aug 2006 21:41:18 -0000	1.25
+++ mkioctls	29 Aug 2006 13:09:59 -0000
@@ -96,6 +96,13 @@
 	keep["JOY_GET_X_OFFSET"] = 1; # Same as GDT_IOCTL_CTRCNT
 	keep["SCIOC_USE_ADF"] = 1; # Same as STICIO_STARTQ
 	keep["SCBUSIOLLSCAN"] = 1; # Same as USB_DISCOVER
+	keep["OPIOCGETNEXT"] = 1; # Same as OFIOCGETNEXT
+	keep["OPIOCGET"] = 1; # Same as OFIOCGET
+	keep["OPIOCGETCHILD"] = 1; # Same as OFIOCGETCHILD
+	keep["OPIOCFINDDEVICE"] = 1; # Same as OFIOCFINDDEVICE
+	keep["OPIOCGETOPTNODE"] = 1; # Same as OFIOCGETOPTNODE
+	keep["OPIOCNEXTPROP"] = 1; # Same as OFIOCNEXTPROP
+	keep["OPIOCSET"] = 1; # Same as OFIOCSET
 
 	i = 1;
 	altqt[i++] = "RED";

--ibTvN161/egqYuK8--