diff options
author | Ian Romanick <idr@us.ibm.com> | 2008-05-12 15:58:55 -0700 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2008-06-10 11:29:15 -0700 |
commit | 4f3da2f200577fcfbf913985246b3a4d23c6a818 (patch) | |
tree | 4b3c50170c142a10c2cfd9e85633457a69ee2427 /linux-core | |
parent | cdd0cb0ab372ac93adc73945627f4071f86f75c0 (diff) |
xgi: Fix 64-bit kernel / 32-bit user issue.
Diffstat (limited to 'linux-core')
-rw-r--r-- | linux-core/xgi_drv.h | 2 | ||||
-rw-r--r-- | linux-core/xgi_fb.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h index 9408073e..0d85e559 100644 --- a/linux-core/xgi_drv.h +++ b/linux-core/xgi_drv.h @@ -86,7 +86,7 @@ extern int xgi_fb_heap_init(struct xgi_info * info); extern int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc, struct drm_file * filp); -extern int xgi_free(struct xgi_info * info, unsigned long index, +extern int xgi_free(struct xgi_info * info, unsigned int index, struct drm_file * filp); extern int xgi_pcie_heap_init(struct xgi_info * info); diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c index 3f50fe8f..e793bd3f 100644 --- a/linux-core/xgi_fb.c +++ b/linux-core/xgi_fb.c @@ -93,7 +93,7 @@ int xgi_alloc_ioctl(struct drm_device * dev, void * data, } -int xgi_free(struct xgi_info * info, unsigned long index, +int xgi_free(struct xgi_info * info, unsigned int index, struct drm_file * filp) { int err; @@ -111,7 +111,7 @@ int xgi_free_ioctl(struct drm_device * dev, void * data, { struct xgi_info *info = dev->dev_private; - return xgi_free(info, *(unsigned long *) data, filp); + return xgi_free(info, *(unsigned int *) data, filp); } |