From owner-svn-src-all@FreeBSD.ORG  Sat May  9 15:09:41 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56F57106564A;
	Sat,  9 May 2009 15:09:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44FCA8FC20;
	Sat,  9 May 2009 15:09:41 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n49F9fLw026865;
	Sat, 9 May 2009 15:09:41 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n49F9fw2026863;
	Sat, 9 May 2009 15:09:41 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200905091509.n49F9fw2026863@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 9 May 2009 15:09:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191936 - in head: sys/sys usr.bin/kdump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 May 2009 15:09:41 -0000

Author: ed
Date: Sat May  9 15:09:40 2009
New Revision: 191936
URL: http://svn.freebsd.org/changeset/base/191936

Log:
  Add support for old TTY ioctls to kdump.
  
  At first I allowed ioctl_compat.h to be included, but it just returned
  an empty file. I had to do this, to keep kdump happy. I really want to
  raise a compiler error when including this header, so now it will just
  throw an error if you don't set COMPAT_43TTY.

Modified:
  head/sys/sys/ioctl_compat.h
  head/usr.bin/kdump/mkioctls

Modified: head/sys/sys/ioctl_compat.h
==============================================================================
--- head/sys/sys/ioctl_compat.h	Sat May  9 08:30:44 2009	(r191935)
+++ head/sys/sys/ioctl_compat.h	Sat May  9 15:09:40 2009	(r191936)
@@ -38,8 +38,6 @@
 #ifndef _SYS_IOCTL_COMPAT_H_
 #define	_SYS_IOCTL_COMPAT_H_
 
-#ifdef _KERNEL
-
 #ifndef COMPAT_43TTY
 #error "Definitions not available without TTY ioctl compat."
 #endif
@@ -151,6 +149,4 @@ struct sgttyb {
 #define	TIOCGLTC	_IOR('t',116,struct ltchars)/* get local special chars*/
 #define OTIOCCONS	_IO('t', 98)	/* for hp300 -- sans int arg */
 
-#endif /* _KERNEL */
-
 #endif /* !_SYS_IOCTL_COMPAT_H_ */

Modified: head/usr.bin/kdump/mkioctls
==============================================================================
--- head/usr.bin/kdump/mkioctls	Sat May  9 08:30:44 2009	(r191935)
+++ head/usr.bin/kdump/mkioctls	Sat May  9 15:09:40 2009	(r191936)
@@ -37,6 +37,7 @@ awk -v x="$ioctl_includes" 'BEGIN {print
 BEGIN {
 	print "/* XXX obnoxious prerequisites. */"
 	print "#define COMPAT_43"
+	print "#define COMPAT_43TTY"
 	print "#include <sys/param.h>"
 	print "#include <sys/devicestat.h>"
 	print "#include <sys/disklabel.h>"