diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /arch/arm/mm/ioremap.c | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mm/ioremap.c')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 75952779ce19..303a7ff6bfd2 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
| @@ -162,7 +162,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size) | |||
| 162 | * Free the page table, if there was one. | 162 | * Free the page table, if there was one. |
| 163 | */ | 163 | */ |
| 164 | if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE) | 164 | if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE) |
| 165 | pte_free_kernel(pmd_page_vaddr(pmd)); | 165 | pte_free_kernel(&init_mm, pmd_page_vaddr(pmd)); |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | addr += PGDIR_SIZE; | 168 | addr += PGDIR_SIZE; |