Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 261377 Details for
Bug 353514
x11-drivers/psb-kmod-4.41.1_p10-r3 does not compile on amd64
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fixes calls to psb_drm_ioctl() on amd64 machines
fix_ioc32_on_amd64.patch (text/plain), 8.28 KB, created by
Sven Eden
on 2011-02-02 21:12:52 UTC
(
hide
)
Description:
Fixes calls to psb_drm_ioctl() on amd64 machines
Filename:
MIME Type:
Creator:
Sven Eden
Created:
2011-02-02 21:12:52 UTC
Size:
8.28 KB
patch
obsolete
>--- drm_ioc32.c 2011-02-02 20:38:38.542718400 +0100 >+++ drm_ioc32.c 2011-02-02 20:38:38.542718400 +0100 >@@ -102,8 +102,7 @@ > &version->desc)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_VERSION, (unsigned long)version); >+ err = psb_drm_ioctl(file, DRM_IOCTL_VERSION, (unsigned long)version); > if (err) > return err; > >@@ -143,8 +142,7 @@ > &u->unique)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_GET_UNIQUE, (unsigned long)u); >+ err = psb_drm_ioctl(file, DRM_IOCTL_GET_UNIQUE, (unsigned long)u); > if (err) > return err; > >@@ -172,8 +170,7 @@ > &u->unique)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_SET_UNIQUE, (unsigned long)u); >+ return psb_drm_ioctl(file, DRM_IOCTL_SET_UNIQUE, (unsigned long)u); > } > > typedef struct drm_map32 { >@@ -203,8 +200,7 @@ > if (__put_user(idx, &map->offset)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_GET_MAP, (unsigned long)map); >+ err = psb_drm_ioctl(file, DRM_IOCTL_GET_MAP, (unsigned long)map); > if (err) > return err; > >@@ -244,8 +240,7 @@ > || __put_user(m32.flags, &map->flags)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_ADD_MAP, (unsigned long)map); >+ err = psb_drm_ioctl(file, DRM_IOCTL_ADD_MAP, (unsigned long)map); > if (err) > return err; > >@@ -282,8 +277,7 @@ > if (__put_user((void *)(unsigned long)handle, &map->handle)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_RM_MAP, (unsigned long)map); >+ return psb_drm_ioctl(file, DRM_IOCTL_RM_MAP, (unsigned long)map); > } > > typedef struct drm_client32 { >@@ -312,8 +306,7 @@ > if (__put_user(idx, &client->idx)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_GET_CLIENT, (unsigned long)client); >+ err = psb_drm_ioctl(file, DRM_IOCTL_GET_CLIENT, (unsigned long)client); > if (err) > return err; > >@@ -349,8 +342,7 @@ > if (!access_ok(VERIFY_WRITE, stats, sizeof(*stats))) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_GET_STATS, (unsigned long)stats); >+ err = psb_drm_ioctl(file, DRM_IOCTL_GET_STATS, (unsigned long)stats); > if (err) > return err; > >@@ -393,8 +385,7 @@ > || __put_user(agp_start, &buf->agp_start)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_ADD_BUFS, (unsigned long)buf); >+ err = psb_drm_ioctl(file, DRM_IOCTL_ADD_BUFS, (unsigned long)buf); > if (err) > return err; > >@@ -425,8 +416,7 @@ > || __put_user(b32.high_mark, &buf->high_mark)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_MARK_BUFS, (unsigned long)buf); >+ return psb_drm_ioctl(file, DRM_IOCTL_MARK_BUFS, (unsigned long)buf); > } > > typedef struct drm_buf_info32 { >@@ -467,8 +457,7 @@ > || __put_user(list, &request->list)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_INFO_BUFS, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_INFO_BUFS, (unsigned long)request); > if (err) > return err; > >@@ -529,8 +518,7 @@ > || __put_user(list, &request->list)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_MAP_BUFS, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_MAP_BUFS, (unsigned long)request); > if (err) > return err; > >@@ -576,8 +564,7 @@ > &request->list)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_FREE_BUFS, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_FREE_BUFS, (unsigned long)request); > } > > typedef struct drm_ctx_priv_map32 { >@@ -603,8 +590,7 @@ > &request->handle)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_SET_SAREA_CTX, (unsigned long)request); > } > > static int compat_drm_getsareactx(struct file *file, unsigned int cmd, >@@ -626,8 +612,7 @@ > if (__put_user(ctx_id, &request->ctx_id)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_GET_SAREA_CTX, (unsigned long)request); > if (err) > return err; > >@@ -662,8 +647,7 @@ > &res->contexts)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_RES_CTX, (unsigned long)res); >+ err = psb_drm_ioctl(file, DRM_IOCTL_RES_CTX, (unsigned long)res); > if (err) > return err; > >@@ -716,8 +700,7 @@ > &d->request_sizes)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_DMA, (unsigned long)d); >+ err = psb_drm_ioctl(file, DRM_IOCTL_DMA, (unsigned long)d); > if (err) > return err; > >@@ -749,8 +732,7 @@ > if (put_user(m32.mode, &mode->mode)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_ENABLE, (unsigned long)mode); >+ return psb_drm_ioctl(file, DRM_IOCTL_AGP_ENABLE, (unsigned long)mode); > } > > typedef struct drm_agp_info32 { >@@ -779,8 +761,7 @@ > if (!access_ok(VERIFY_WRITE, info, sizeof(*info))) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_INFO, (unsigned long)info); >+ err = psb_drm_ioctl(file, DRM_IOCTL_AGP_INFO, (unsigned long)info); > if (err) > return err; > >@@ -825,16 +806,14 @@ > || __put_user(req32.type, &request->type)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_ALLOC, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_AGP_ALLOC, (unsigned long)request); > if (err) > return err; > > if (__get_user(req32.handle, &request->handle) > || __get_user(req32.physical, &request->physical) > || copy_to_user(argp, &req32, sizeof(req32))) { >- psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_FREE, (unsigned long)request); >+ psb_drm_ioctl(file, DRM_IOCTL_AGP_FREE, (unsigned long)request); > return -EFAULT; > } > >@@ -854,8 +833,7 @@ > || __put_user(handle, &request->handle)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_FREE, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_AGP_FREE, (unsigned long)request); > } > > typedef struct drm_agp_binding32 { >@@ -879,8 +857,7 @@ > || __put_user(req32.offset, &request->offset)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_BIND, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_AGP_BIND, (unsigned long)request); > } > > static int compat_drm_agp_unbind(struct file *file, unsigned int cmd, >@@ -896,8 +873,7 @@ > || __put_user(handle, &request->handle)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_AGP_UNBIND, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_AGP_UNBIND, (unsigned long)request); > } > #endif /* __OS_HAS_AGP */ > >@@ -921,8 +897,7 @@ > || __put_user(x, &request->size)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_SG_ALLOC, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_SG_ALLOC, (unsigned long)request); > if (err) > return err; > >@@ -948,8 +923,7 @@ > || __put_user(x << PAGE_SHIFT, &request->handle)) > return -EFAULT; > >- return psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_SG_FREE, (unsigned long)request); >+ return psb_drm_ioctl(file, DRM_IOCTL_SG_FREE, (unsigned long)request); > } > > struct drm_wait_vblank_request32 { >@@ -988,8 +962,7 @@ > || __put_user(req32.request.signal, &request->request.signal)) > return -EFAULT; > >- err = psb_drm_ioctl(file->f_dentry->d_inode, file, >- DRM_IOCTL_WAIT_VBLANK, (unsigned long)request); >+ err = psb_drm_ioctl(file, DRM_IOCTL_WAIT_VBLANK, (unsigned long)request); > if (err) > return err; > >@@ -1057,7 +1030,7 @@ > * than always failing. > */ > if (nr >= DRM_ARRAY_SIZE(drm_compat_ioctls)) >- return psb_drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); >+ return psb_drm_ioctl(filp, cmd, arg); > > fn = drm_compat_ioctls[nr]; > >@@ -1065,7 +1038,7 @@ > if (fn != NULL) > ret = (*fn)(filp, cmd, arg); > else >- ret = psb_drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); >+ ret = psb_drm_ioctl(filp, cmd, arg); > unlock_kernel(); > > return ret;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=261377">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 353514
:
261344
|
261345
|
261376
| 261377
