2 files changed, 4 insertions, 10 deletions

diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index d496e9f1a601..4e3dcd0c4716 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -144,7 +144,8 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 void __init_refok free_initmem(void)
 {
         free_init_pages("unused kernel memory",
-            (unsigned long)__init_begin, (unsigned long)__init_end);
+        __pa(&__init_begin),
+        __pa(&__init_end));
 }
 
 unsigned long pgd_current;
@@ -156,4 +157,5 @@ unsigned long pgd_current;
  * are constants.  So we use the variants from asm-offset.h until that gcc
  * will officially be retired.
  */
+pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PTE_ORDER);
 pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned(PTE_ORDER);
diff --git a/arch/score/mm/pgtable.c b/arch/score/mm/pgtable.c
index 10b0962f83d4..6408bb73d3cc 100644
--- a/arch/score/mm/pgtable.c
+++ b/arch/score/mm/pgtable.c
@@ -47,14 +47,6 @@ void pgd_init(unsigned long page)
 
 void __init pagetable_init(void)
 {
-        unsigned long vaddr;
-        pgd_t *pgd_base;
-
         /* Initialize the entire pgd. */
-        pgd_init((unsigned long) swapper_pg_dir);
-        pgd_init((unsigned long) swapper_pg_dir
-                + sizeof(pgd_t) * USER_PTRS_PER_PGD);
-
-        pgd_base = swapper_pg_dir;
-        vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
+        pgd_init((unsigned long)swapper_pg_dir);
 }