From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6821e0cfe74802aefd2067b40fcdc03fc4599e;p=pandora-kernel.git

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 <tj@kernel.org>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

Reading git-diff-tree failed