diff options
| -rw-r--r-- | bsd-core/drm_drv.c | 2 | ||||
| -rw-r--r-- | bsd-core/drm_os_freebsd.h | 2 | ||||
| -rw-r--r-- | bsd-core/drm_os_netbsd.h | 2 | ||||
| -rw-r--r-- | bsd-core/r128_drv.c | 2 | ||||
| -rw-r--r-- | bsd-core/radeon_drv.c | 2 | ||||
| -rw-r--r-- | bsd/drm_drv.h | 2 | ||||
| -rw-r--r-- | bsd/drm_os_freebsd.h | 2 | ||||
| -rw-r--r-- | bsd/drm_os_netbsd.h | 2 | ||||
| -rw-r--r-- | bsd/r128_drv.c | 2 | ||||
| -rw-r--r-- | bsd/radeon_drv.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/bsd-core/drm_drv.c b/bsd-core/drm_drv.c index fda2c158..cb5dea61 100644 --- a/bsd-core/drm_drv.c +++ b/bsd-core/drm_drv.c @@ -963,7 +963,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) if ( !func ) { DRM_DEBUG( "no function\n" ); retcode = EINVAL; - } else if ( ( ioctl->root_only && DRM_OS_CHECKSUSER ) + } else if ( ( ioctl->root_only && DRM_OS_SUSER(p) ) || ( ioctl->auth_needed && !priv->authenticated ) ) { retcode = EACCES; } else { diff --git a/bsd-core/drm_os_freebsd.h b/bsd-core/drm_os_freebsd.h index 333f592e..d06bb354 100644 --- a/bsd-core/drm_os_freebsd.h +++ b/bsd-core/drm_os_freebsd.h @@ -119,7 +119,7 @@ do { \ } while (0) #define DRM_OS_RETURN(v) return v; - +#define DRM_OS_ERR(v) v #define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \ *arg1 = arg2 diff --git a/bsd-core/drm_os_netbsd.h b/bsd-core/drm_os_netbsd.h index c3ea8ac9..fcc92b60 100644 --- a/bsd-core/drm_os_netbsd.h +++ b/bsd-core/drm_os_netbsd.h @@ -76,7 +76,7 @@ do { \ } while (0) #define DRM_OS_RETURN(v) return v; - +#define DRM_OS_ERR(v) v #define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \ *arg1 = arg2 diff --git a/bsd-core/r128_drv.c b/bsd-core/r128_drv.c index 57e35808..091dce5f 100644 --- a/bsd-core/r128_drv.c +++ b/bsd-core/r128_drv.c @@ -143,7 +143,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_memory.h" #include "drm_sysctl.h" #include "drm_vm.h" -#if __REALLY_HAVE_SG +#if __HAVE_SG #include "drm_scatter.h" #endif diff --git a/bsd-core/radeon_drv.c b/bsd-core/radeon_drv.c index 4b922681..4e32192a 100644 --- a/bsd-core/radeon_drv.c +++ b/bsd-core/radeon_drv.c @@ -115,7 +115,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_memory.h" #include "drm_vm.h" #include "drm_sysctl.h" -#if __REALLY_HAVE_SG +#if __HAVE_SG #include "drm_scatter.h" #endif diff --git a/bsd/drm_drv.h b/bsd/drm_drv.h index fda2c158..cb5dea61 100644 --- a/bsd/drm_drv.h +++ b/bsd/drm_drv.h @@ -963,7 +963,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) if ( !func ) { DRM_DEBUG( "no function\n" ); retcode = EINVAL; - } else if ( ( ioctl->root_only && DRM_OS_CHECKSUSER ) + } else if ( ( ioctl->root_only && DRM_OS_SUSER(p) ) || ( ioctl->auth_needed && !priv->authenticated ) ) { retcode = EACCES; } else { diff --git a/bsd/drm_os_freebsd.h b/bsd/drm_os_freebsd.h index 333f592e..d06bb354 100644 --- a/bsd/drm_os_freebsd.h +++ b/bsd/drm_os_freebsd.h @@ -119,7 +119,7 @@ do { \ } while (0) #define DRM_OS_RETURN(v) return v; - +#define DRM_OS_ERR(v) v #define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \ *arg1 = arg2 diff --git a/bsd/drm_os_netbsd.h b/bsd/drm_os_netbsd.h index c3ea8ac9..fcc92b60 100644 --- a/bsd/drm_os_netbsd.h +++ b/bsd/drm_os_netbsd.h @@ -76,7 +76,7 @@ do { \ } while (0) #define DRM_OS_RETURN(v) return v; - +#define DRM_OS_ERR(v) v #define DRM_OS_KRNTOUSR(arg1, arg2, arg3) \ *arg1 = arg2 diff --git a/bsd/r128_drv.c b/bsd/r128_drv.c index 57e35808..091dce5f 100644 --- a/bsd/r128_drv.c +++ b/bsd/r128_drv.c @@ -143,7 +143,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_memory.h" #include "drm_sysctl.h" #include "drm_vm.h" -#if __REALLY_HAVE_SG +#if __HAVE_SG #include "drm_scatter.h" #endif diff --git a/bsd/radeon_drv.c b/bsd/radeon_drv.c index 4b922681..4e32192a 100644 --- a/bsd/radeon_drv.c +++ b/bsd/radeon_drv.c @@ -115,7 +115,7 @@ drm_chipinfo_t DRM(devicelist)[] = { #include "drm_memory.h" #include "drm_vm.h" #include "drm_sysctl.h" -#if __REALLY_HAVE_SG +#if __HAVE_SG #include "drm_scatter.h" #endif |