From owner-svn-src-head@FreeBSD.ORG Thu Jan 29 19:55:34 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B0042E7; Thu, 29 Jan 2015 19:55:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D29DFAD; Thu, 29 Jan 2015 19:55:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0TJtXxV005954; Thu, 29 Jan 2015 19:55:33 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0TJtX7c005952; Thu, 29 Jan 2015 19:55:33 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201501291955.t0TJtX7c005952@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 29 Jan 2015 19:55:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277897 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2015 19:55:34 -0000 Author: jhb Date: Thu Jan 29 19:55:33 2015 New Revision: 277897 URL: https://svnweb.freebsd.org/changeset/base/277897 Log: Remove the d_thread_t compatibility shim provided in 5.0 to handle the struct thread (<= 4.x) vs struct proc (>= 5.0) argument to cdevsw routines. It is long past its expiration date. PR: 196544 (exp-run) Modified: head/sys/sys/conf.h head/sys/sys/param.h Modified: head/sys/sys/conf.h ============================================================================== --- head/sys/sys/conf.h Thu Jan 29 19:21:21 2015 (r277896) +++ head/sys/sys/conf.h Thu Jan 29 19:55:33 2015 (r277897) @@ -106,24 +106,6 @@ struct clonedevs; struct vm_object; struct vnode; -/* - * Note: d_thread_t is provided as a transition aid for those drivers - * that treat struct proc/struct thread as an opaque data type and - * exist in substantially the same form in both 4.x and 5.x. Writers - * of drivers that dips into the d_thread_t structure should use - * struct thread or struct proc as appropriate for the version of the - * OS they are using. It is provided in lieu of each device driver - * inventing its own way of doing this. While it does violate style(9) - * in a number of ways, this violation is deemed to be less - * important than the benefits that a uniform API between releases - * gives. - * - * Users of struct thread/struct proc that aren't device drivers should - * not use d_thread_t. - */ - -typedef struct thread d_thread_t; - typedef int d_open_t(struct cdev *dev, int oflags, int devtype, struct thread *td); typedef int d_fdopen_t(struct cdev *dev, int oflags, struct thread *td, struct file *fp); typedef int d_close_t(struct cdev *dev, int fflag, int devtype, struct thread *td); Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Thu Jan 29 19:21:21 2015 (r277896) +++ head/sys/sys/param.h Thu Jan 29 19:55:33 2015 (r277897) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100056 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100057 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,