a couple more -CURRENT fixes.

4 files changed, 12 insertions, 12 deletions

diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c
index 52653171..acead83d 100644
--- a/linux-core/drm_drv.c
+++ b/linux-core/drm_drv.c
@@ -926,7 +926,7 @@ int DRM(version)( DRM_OS_IOCTL )
 int DRM(open)( struct inode *inode, struct file *filp )
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM( open)(dev_t kdev, int flags, int fmt, struct proc *p)
+int DRM( open)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p)
 #endif /* __FreeBSD__ */
 {
 	drm_device_t *dev = NULL;
@@ -982,7 +982,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
 	drm_device_t *dev;
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
+int DRM( close)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p)
 {
 	drm_file_t *priv;
 	drm_device_t  *dev    = kdev->si_drv1;
@@ -1419,7 +1419,7 @@ SYSUNINIT(DRM( unregister), SI_SUB_KLD, SI_ORDER_MIDDLE, linux_ioctl_unregister_
  * Linux emulation IOCTL
  */
 static int
-DRM(linux_ioctl)(struct proc* p, struct linux_ioctl_args* args)
+DRM(linux_ioctl)(DRM_OS_STRUCTPROC *p, struct linux_ioctl_args* args)
 {
     struct file		*fp = p->p_fd->fd_ofiles[args->fd];
     u_long		cmd = args->cmd;
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c
index 09533113..c700bb71 100644
--- a/linux-core/drm_fops.c
+++ b/linux-core/drm_fops.c
@@ -41,7 +41,7 @@
 #include <sys/signalvar.h>
 #include <sys/poll.h>
 
-drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, struct proc *p)
+drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_OS_STRUCTPROC *p)
 {
 #if __FreeBSD_version >= 500021
 	uid_t uid = p->p_ucred->cr_svuid;
@@ -66,7 +66,7 @@ int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
 	kdev_t	     m = MINOR(inode->i_rdev);
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
+int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p,
 		    drm_device_t *dev)
 {
 	int	     m = minor(kdev);
@@ -332,7 +332,7 @@ unsigned int DRM(poll)(struct file *filp, struct poll_table_struct *wait)
 }
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM(poll)(dev_t kdev, int events, struct proc *p)
+int DRM(poll)(dev_t kdev, int events, DRM_OS_STRUCTPROC *p)
 {
 	drm_device_t  *dev    = kdev->si_drv1;
 	int           s;
diff --git a/linux/drm_drv.h b/linux/drm_drv.h
index 52653171..acead83d 100644
--- a/linux/drm_drv.h
+++ b/linux/drm_drv.h
@@ -926,7 +926,7 @@ int DRM(version)( DRM_OS_IOCTL )
 int DRM(open)( struct inode *inode, struct file *filp )
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM( open)(dev_t kdev, int flags, int fmt, struct proc *p)
+int DRM( open)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p)
 #endif /* __FreeBSD__ */
 {
 	drm_device_t *dev = NULL;
@@ -982,7 +982,7 @@ int DRM(release)( struct inode *inode, struct file *filp )
 	drm_device_t *dev;
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p)
+int DRM( close)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p)
 {
 	drm_file_t *priv;
 	drm_device_t  *dev    = kdev->si_drv1;
@@ -1419,7 +1419,7 @@ SYSUNINIT(DRM( unregister), SI_SUB_KLD, SI_ORDER_MIDDLE, linux_ioctl_unregister_
  * Linux emulation IOCTL
  */
 static int
-DRM(linux_ioctl)(struct proc* p, struct linux_ioctl_args* args)
+DRM(linux_ioctl)(DRM_OS_STRUCTPROC *p, struct linux_ioctl_args* args)
 {
     struct file		*fp = p->p_fd->fd_ofiles[args->fd];
     u_long		cmd = args->cmd;
diff --git a/linux/drm_fops.h b/linux/drm_fops.h
index 09533113..c700bb71 100644
--- a/linux/drm_fops.h
+++ b/linux/drm_fops.h
@@ -41,7 +41,7 @@
 #include <sys/signalvar.h>
 #include <sys/poll.h>
 
-drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, struct proc *p)
+drm_file_t *DRM(find_file_by_proc)(drm_device_t *dev, DRM_OS_STRUCTPROC *p)
 {
 #if __FreeBSD_version >= 500021
 	uid_t uid = p->p_ucred->cr_svuid;
@@ -66,7 +66,7 @@ int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
 	kdev_t	     m = MINOR(inode->i_rdev);
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM(open_helper)(dev_t kdev, int flags, int fmt, struct proc *p,
+int DRM(open_helper)(dev_t kdev, int flags, int fmt, DRM_OS_STRUCTPROC *p,
 		    drm_device_t *dev)
 {
 	int	     m = minor(kdev);
@@ -332,7 +332,7 @@ unsigned int DRM(poll)(struct file *filp, struct poll_table_struct *wait)
 }
 #endif /* __linux__ */
 #ifdef __FreeBSD__
-int DRM(poll)(dev_t kdev, int events, struct proc *p)
+int DRM(poll)(dev_t kdev, int events, DRM_OS_STRUCTPROC *p)
 {
 	drm_device_t  *dev    = kdev->si_drv1;
 	int           s;