2 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index 2728b0e7d2bb..3f6dc40b8353 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -120,6 +120,8 @@ full_search:
  */
 int valid_phys_addr_range(unsigned long addr, size_t size)
 {
+        if (addr < PHYS_OFFSET)
+                return 0;
         if (addr + size > __pa(high_memory))
                 return 0;
 
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index 500c9610ab30..e0f19ab91163 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -75,7 +75,7 @@ no_pgd:
 void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
 {
         pmd_t *pmd;
-        struct page *pte;
+        pgtable_t pte;
 
         if (!pgd)
                 return;
@@ -90,10 +90,8 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
                 goto free;
         }
 
-        pte = pmd_page(*pmd);
+        pte = pmd_pgtable(*pmd);
         pmd_clear(pmd);
-        dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);
-        pte_lock_deinit(pte);
         pte_free(mm, pte);
         pmd_free(mm, pmd);
 free: