projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
arch
/
microblaze
/
mm
/
consistent.c
diff --git
a/arch/microblaze/mm/consistent.c
b/arch/microblaze/mm/consistent.c
index
dbbf224
..
e10ad93
100644
(file)
--- a/
arch/microblaze/mm/consistent.c
+++ b/
arch/microblaze/mm/consistent.c
@@
-117,7
+117,7
@@
void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle)
ret = (void *)va;
/* This gives us the real physical address of the first page. */
- *dma_handle = pa =
virt_to_bus((void *)
vaddr);
+ *dma_handle = pa =
__virt_to_phys(
vaddr);
#endif
/*