diff options
author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 11:36:43 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2003-03-25 11:36:43 +0000 |
commit | b3eb34e0ea0ec7c550df5fd6b25efcf9e35c53cd (patch) | |
tree | 3ba6b39dc03658d840555d19c1ff56e2da8ce72c /linux/sis_mm.c | |
parent | c14006ba9f0522875327998215150067d8ca6ea7 (diff) |
linux merge for drm
Diffstat (limited to 'linux/sis_mm.c')
-rw-r--r-- | linux/sis_mm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/sis_mm.c b/linux/sis_mm.c index 81832769..b2aa22d4 100644 --- a/linux/sis_mm.c +++ b/linux/sis_mm.c @@ -183,10 +183,10 @@ int sisp_agp_alloc(struct inode *inode, struct file *filp, unsigned int cmd, if(block){ /* TODO */ agp.offset = block->ofs; - agp.free = (unsigned int)block; + agp.free = (unsigned long)block; if(!add_alloc_set(agp.context, AGP_TYPE, agp.free)){ DRM_DEBUG("adding to allocation set fails\n"); - mmFreeMem((PMemBlock)agp.free); + mmFreeMem((PMemBlock)(unsigned long)agp.free); retval = -1; } } @@ -219,7 +219,7 @@ int sisp_agp_free(struct inode *inode, struct file *filp, unsigned int cmd, return -1; } - mmFreeMem((PMemBlock)agp.free); + mmFreeMem((PMemBlock)(unsigned long)agp.free); if(!del_alloc_set(agp.context, AGP_TYPE, agp.free)) retval = -1; @@ -289,7 +289,7 @@ int sis_final_context(int context) retval = setFirst(set, &item); while(retval){ DRM_DEBUG("free agp memory 0x%x\n", item); - mmFreeMem((PMemBlock)item); + mmFreeMem((PMemBlock)(unsigned long)item); retval = setNext(set, &item); } setDestroy(set); |