Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub…

…/scm/linux/kernel/git/konrad/xen * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
mariux64 · Jan 10, 2012 · ae5cfc0 · ae5cfc0
2 parents 3dcf6c1 + dc6821e
commit ae5cfc0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
@@ -1852,7 +1852,7 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
 	xen_write_cr3(__pa(initial_page_table));
 
 	memblock_reserve(__pa(xen_start_info->pt_base),
-			 xen_start_info->nr_pt_frames * PAGE_SIZE));
+			 xen_start_info->nr_pt_frames * PAGE_SIZE);
 
 	return initial_page_table;
 }