Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5cfc05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/for-linus-fixes-3.3' of... 

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.
parents 3dcf6c1b dc6821e0

arch/x86/xen/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}