aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/vsyscall_64.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-01-07 21:27:38 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2012-01-09 12:05:05 -0500
commitdc6821e0cfe74802aefd2067b40fcdc03fc4599e (patch)
treece7e455e8367090c561b18fff59a5d0fd919a750 /arch/x86/kernel/vsyscall_64.c
parentd4bbf7e7759afc172e2bfbc5c416324590049cdd (diff)
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>
Diffstat (limited to 'arch/x86/kernel/vsyscall_64.c')
0 files changed, 0 insertions, 0 deletions