Messages in this thread Patch in this message | | | Date | Mon, 9 Jan 2012 12:52:48 -0500 | From | Konrad Rzeszutek Wilk <> | Subject | [GIT PULL] (xen) stable/for-linus-fixes-3.3 for 3.3-rc0 (bug in 3.3-rc0) |
| |
Hey Linus,
Please git pull the following git branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-linus-fixes-3.3
which has one compile fix on top of d4bbf7e7759afc172e2bfbc5c416324590049cdd (which was merged in your 3.3 tree on Friday), the git commit is: Tejun Heo (1): Merge branch 'master' into x86/memblock
One simple mismerge where an extra ')' was left.
arch/x86/xen/mmu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Konrad Rzeszutek Wilk (1): xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index f4bf8aa..58a0e46 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; }[unhandled content-type:application/pgp-signature] | |