diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /arch/microblaze/mm/pgtable.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/microblaze/mm/pgtable.c')
| -rw-r--r-- | arch/microblaze/mm/pgtable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/mm/pgtable.c b/arch/microblaze/mm/pgtable.c index 2820081b21ab..63a6fd07c48f 100644 --- 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, | |||
| 103 | area = get_vm_area(size, VM_IOREMAP); | 103 | area = get_vm_area(size, VM_IOREMAP); |
| 104 | if (area == NULL) | 104 | if (area == NULL) |
| 105 | return NULL; | 105 | return NULL; |
| 106 | v = VMALLOC_VMADDR(area->addr); | 106 | v = (unsigned long) area->addr; |
| 107 | } else { | 107 | } else { |
| 108 | v = (ioremap_bot -= size); | 108 | v = (ioremap_bot -= size); |
| 109 | } | 109 | } |