diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-05-11 04:43:43 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-05-11 04:43:43 +0000 |
| commit | 853adb8be338de113301d7db3c10058476f3bff7 (patch) | |
| tree | 22ce0530d9c01993cdeea67c381fcd31a12fe673 /shared-core | |
| parent | 485b259b4492ed6b7abdf063d1d5cefe01d3a3b0 (diff) | |
Merge from FreeBSD-current. Mostly 64-bit cleanliness fixes, but a few
driver interface changes from -current.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/sis_ds.h | 2 | ||||
| -rw-r--r-- | shared-core/sis_mm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shared-core/sis_ds.h b/shared-core/sis_ds.h index 482693fe..bbd3fe1b 100644 --- a/shared-core/sis_ds.h +++ b/shared-core/sis_ds.h @@ -35,7 +35,7 @@ #define SET_SIZE 5000 -typedef unsigned int ITEM_TYPE; +typedef unsigned long ITEM_TYPE; typedef struct { ITEM_TYPE val; diff --git a/shared-core/sis_mm.c b/shared-core/sis_mm.c index 092096c4..7b10db97 100644 --- a/shared-core/sis_mm.c +++ b/shared-core/sis_mm.c @@ -371,7 +371,7 @@ int sis_final_context(int context) if (i < MAX_CONTEXT) { set_t *set; - unsigned int item; + ITEM_TYPE item; int retval; DRM_DEBUG("find socket %d, context = %d\n", i, context); @@ -380,7 +380,7 @@ int sis_final_context(int context) set = global_ppriv[i].sets[0]; retval = setFirst(set, &item); while (retval) { - DRM_DEBUG("free video memory 0x%x\n", item); + DRM_DEBUG("free video memory 0x%lx\n", item); #if defined(__linux__) && defined(CONFIG_FB_SIS) sis_free(item); #else @@ -394,7 +394,7 @@ int sis_final_context(int context) set = global_ppriv[i].sets[1]; retval = setFirst(set, &item); while (retval) { - DRM_DEBUG("free agp memory 0x%x\n", item); + DRM_DEBUG("free agp memory 0x%lx\n", item); mmFreeMem((PMemBlock)item); retval = setNext(set, &item); } |