PERFORCE change 48049 for review
Peter Wemm
peter at FreeBSD.org
Wed Mar 3 00:34:37 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48049
Change 48049 by peter at peter_daintree on 2004/03/03 00:33:43
IFC @48048
Affected files ...
.. //depot/projects/hammer/sys/dev/drm/drm_drv.h#13 integrate
.. //depot/projects/hammer/sys/dev/drm/drm_vm.h#8 integrate
.. //depot/projects/hammer/sys/dev/drm/sis_ds.h#2 integrate
Differences ...
==== //depot/projects/hammer/sys/dev/drm/drm_drv.h#13 (text+ko) ====
@@ -28,7 +28,7 @@
* Rickard E. (Rik) Faith <faith at valinux.com>
* Gareth Hughes <gareth at valinux.com>
*
- * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.22 2004/03/03 06:18:29 obrien Exp $
+ * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.23 2004/03/03 08:27:33 obrien Exp $
*/
/*
@@ -829,7 +829,7 @@
drm_file_t *priv;
DRM_DEVICE;
int retcode = 0;
- DRMFILE filp = (void *)(intptr_t)(DRM_CURRENTPID);
+ DRMFILE filp = (void *)(uintptr_t)(DRM_CURRENTPID);
DRM_DEBUG( "open_count = %d\n", dev->open_count );
@@ -907,7 +907,7 @@
}
}
#elif __HAVE_DMA
- DRM(reclaim_buffers)( dev, (void *)(intptr_t)priv->pid );
+ DRM(reclaim_buffers)( dev, (void *)(uintptr_t)priv->pid );
#endif
#if defined (__FreeBSD__) && (__FreeBSD_version >= 500000)
@@ -952,7 +952,7 @@
int nr = DRM_IOCTL_NR(cmd);
drm_file_t *priv;
- DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID);
+ DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(uintptr_t)DRM_CURRENTPID);
atomic_inc( &dev->counts[_DRM_STAT_IOCTLS] );
++priv->ioctl_count;
@@ -1007,7 +1007,7 @@
!priv->authenticated))
return EACCES;
- retcode = func(kdev, cmd, data, flags, p, (void *)(intptr_t)DRM_CURRENTPID);
+ retcode = func(kdev, cmd, data, flags, p, (void *)(uintptr_t)DRM_CURRENTPID);
return DRM_ERR(retcode);
}
@@ -1038,7 +1038,7 @@
DRM_LOCK();
for (;;) {
if (DRM(lock_take)(&dev->lock.hw_lock->lock, lock.context)) {
- dev->lock.filp = (void *)(intptr_t)DRM_CURRENTPID;
+ dev->lock.filp = (void *)(uintptr_t)DRM_CURRENTPID;
dev->lock.lock_time = jiffies;
atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
break; /* Got lock */
==== //depot/projects/hammer/sys/dev/drm/drm_vm.h#8 (text+ko) ====
@@ -22,7 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*
*
- * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.9 2004/03/03 06:18:29 obrien Exp $
+ * $FreeBSD: src/sys/dev/drm/drm_vm.h,v 1.10 2004/03/03 08:27:33 obrien Exp $
*/
#if defined(__FreeBSD__) && __FreeBSD_version >= 500102
@@ -68,7 +68,7 @@
drm_map_list_entry_t *listentry = NULL;
drm_file_t *priv;
- DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(intptr_t)DRM_CURRENTPID);
+ DRM_GET_PRIV_WITH_RETURN(priv, (DRMFILE)(uintptr_t)DRM_CURRENTPID);
if (!priv->authenticated)
return DRM_ERR(EACCES);
==== //depot/projects/hammer/sys/dev/drm/sis_ds.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* Authors:
* Sung-Ching Lin <sclin at sis.com.tw>
*
- * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.1 2003/09/09 00:24:31 anholt Exp $
+ * $FreeBSD: src/sys/dev/drm/sis_ds.h,v 1.2 2004/03/03 08:24:31 obrien Exp $
*/
#ifndef __SIS_DS_H__
@@ -36,7 +36,7 @@
#define SET_SIZE 5000
-typedef unsigned int ITEM_TYPE;
+typedef unsigned long ITEM_TYPE;
typedef struct {
ITEM_TYPE val;
More information about the p4-projects
mailing list