2 files changed, 6 insertions, 7 deletions

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index e425a32e0a90..77b242c9a11e 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1762,9 +1762,9 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 {
         pmd_t *kernel_pmd;
 
-        init_pg_tables_start = __pa(pgd);
-        init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE;
-        max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024);
+        max_pfn_mapped = PFN_DOWN(__pa(xen_start_info->pt_base) +
+                                  xen_start_info->nr_pt_frames * PAGE_SIZE +
+                                  512*1024);
 
         kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd);
         memcpy(level2_kernel_pgt, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD);
@@ -1916,7 +1916,6 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = {
 
 #ifdef CONFIG_X86_PAE
         .set_pte_atomic = xen_set_pte_atomic,
-        .set_pte_present = xen_set_pte_at,
         .pte_clear = xen_pte_clear,
         .pmd_clear = xen_pmd_clear,
 #endif  /* CONFIG_X86_PAE */
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 304d832710cd..429834ec1687 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -158,7 +158,7 @@ static void __init xen_fill_possible_map(void)
                 rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
                 if (rc >= 0) {
                         num_processors++;
-                        cpu_set(i, cpu_possible_map);
+                        set_cpu_possible(i, true);
                 }
         }
 }
@@ -197,7 +197,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
         while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
                 for (cpu = nr_cpu_ids - 1; !cpu_possible(cpu); cpu--)
                         continue;
-                cpu_clear(cpu, cpu_possible_map);
+                set_cpu_possible(cpu, false);
         }
 
         for_each_possible_cpu (cpu) {
@@ -210,7 +210,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
                 if (IS_ERR(idle))
                         panic("failed fork for CPU %d", cpu);
 
-                cpu_set(cpu, cpu_present_map);
+                set_cpu_present(cpu, true);
         }
 }