diff options
author | Thierry Reding <treding@nvidia.com> | 2013-11-08 07:15:43 -0500 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2013-12-03 04:04:42 -0500 |
commit | a7ed68fcc73fd91acc0502b88e44a69f78864d89 (patch) | |
tree | a6859d5b5718f76e897100f67862164a43763b63 | |
parent | 7602fa1d29f5c4e92d6a36e79000a0f55c317a32 (diff) |
drm/tegra: Fix address space mismatches
sparse complains because __user annotations aren't placed consistently.
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/gpu/drm/tegra/drm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 28e178137718..56b29c3cdf2f 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c | |||
@@ -135,11 +135,11 @@ int tegra_drm_submit(struct tegra_drm_context *context, | |||
135 | unsigned int num_relocs = args->num_relocs; | 135 | unsigned int num_relocs = args->num_relocs; |
136 | unsigned int num_waitchks = args->num_waitchks; | 136 | unsigned int num_waitchks = args->num_waitchks; |
137 | struct drm_tegra_cmdbuf __user *cmdbufs = | 137 | struct drm_tegra_cmdbuf __user *cmdbufs = |
138 | (void * __user)(uintptr_t)args->cmdbufs; | 138 | (void __user *)(uintptr_t)args->cmdbufs; |
139 | struct drm_tegra_reloc __user *relocs = | 139 | struct drm_tegra_reloc __user *relocs = |
140 | (void * __user)(uintptr_t)args->relocs; | 140 | (void __user *)(uintptr_t)args->relocs; |
141 | struct drm_tegra_waitchk __user *waitchks = | 141 | struct drm_tegra_waitchk __user *waitchks = |
142 | (void * __user)(uintptr_t)args->waitchks; | 142 | (void __user *)(uintptr_t)args->waitchks; |
143 | struct drm_tegra_syncpt syncpt; | 143 | struct drm_tegra_syncpt syncpt; |
144 | struct host1x_job *job; | 144 | struct host1x_job *job; |
145 | int err; | 145 | int err; |
@@ -204,7 +204,7 @@ int tegra_drm_submit(struct tegra_drm_context *context, | |||
204 | if (err) | 204 | if (err) |
205 | goto fail; | 205 | goto fail; |
206 | 206 | ||
207 | err = copy_from_user(&syncpt, (void * __user)(uintptr_t)args->syncpts, | 207 | err = copy_from_user(&syncpt, (void __user *)(uintptr_t)args->syncpts, |
208 | sizeof(syncpt)); | 208 | sizeof(syncpt)); |
209 | if (err) | 209 | if (err) |
210 | goto fail; | 210 | goto fail; |