git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
microblaze
/
mm
/
pgtable.c
diff --git
a/arch/microblaze/mm/pgtable.c
b/arch/microblaze/mm/pgtable.c
index
2820081
..
63a6fd0
100644
(file)
--- a/
arch/microblaze/mm/pgtable.c
+++ b/
arch/microblaze/mm/pgtable.c
@@
-103,7
+103,7
@@
static void __iomem *__ioremap(phys_addr_t addr, unsigned long size,
area = get_vm_area(size, VM_IOREMAP);
if (area == NULL)
return NULL;
- v =
VMALLOC_VMADDR(area->addr)
;
+ v =
(unsigned long) area->addr
;
} else {
v = (ioremap_bot -= size);
}