summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/tlb.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-07-30 10:47:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-30 10:47:55 +0100
commit0a52ac8d181e938d640c2da70cad6d1301abe775 (patch)
tree046edf3437a49d3f6989d152bd94fcc80906b86d /arch/arm/include/asm/tlb.h
parente81b795d44ba04beab7714de65ed2e377823bd37 (diff)
parent9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff)
downloadblackbird-op-linux-0a52ac8d181e938d640c2da70cad6d1301abe775.tar.gz
blackbird-op-linux-0a52ac8d181e938d640c2da70cad6d1301abe775.zip
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/include/asm/tlb.h')
-rw-r--r--arch/arm/include/asm/tlb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index 321c83e43a1e..f41a6f57cd12 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -102,8 +102,8 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
}
#define tlb_remove_page(tlb,page) free_page_and_swap_cache(page)
-#define pte_free_tlb(tlb, ptep) pte_free((tlb)->mm, ptep)
-#define pmd_free_tlb(tlb, pmdp) pmd_free((tlb)->mm, pmdp)
+#define pte_free_tlb(tlb, ptep, addr) pte_free((tlb)->mm, ptep)
+#define pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, pmdp)
#define tlb_migrate_finish(mm) do { } while (0)
OpenPOWER on IntegriCloud