From: Konrad Rzeszutek Wilk Date: Sun, 8 Jan 2012 02:27:38 +0000 (-0500) Subject: xen/mmu: Fix compile errors introduced by x86/memblock mismerge. X-Git-Tag: v3.3-rc1~130^2 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=dc6821e0cfe74802aefd2067b40fcdc03fc4599e;p=~andy%2Flinux xen/mmu: Fix compile errors introduced by x86/memblock mismerge. The git commit d4bbf7e7759afc172e2bfbc5c416324590049cdd "Merge branch 'master' into x86/memblock" mismerged the 32-bit section causing: arch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’: arch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token arch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token Acked-by: Tejun Heo Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f4bf8aa574f..58a0e46c404 100644 --- 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; }