projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
char
/
drm
/
r300_cmdbuf.c
diff --git
a/drivers/char/drm/r300_cmdbuf.c
b/drivers/char/drm/r300_cmdbuf.c
index
b108c7f
..
26bdf2c
100644
(file)
--- a/
drivers/char/drm/r300_cmdbuf.c
+++ b/
drivers/char/drm/r300_cmdbuf.c
@@
-723,7
+723,7
@@
static int r300_scratch(drm_radeon_private_t *dev_priv,
dev_priv->scratch_ages[header.scratch.reg]++;
- ref_age_base =
*(u32 **)cmdbuf->buf
;
+ ref_age_base =
(u32 *)(unsigned long)*((uint64_t *)cmdbuf->buf)
;
cmdbuf->buf += sizeof(u64);
cmdbuf->bufsz -= sizeof(u64);