lkml.org 
[lkml]   [2012]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: Compile errors on 32-bit build due to d4bbf7e7759afc172e2bfbc5c416324590049cdd
Hello, Konrad.

On Sat, Jan 07, 2012 at 09:40:29PM -0500, Konrad Rzeszutek Wilk wrote:
> Hey Tejun
>
> Your patch titled " Merge branch 'master' into x86/memblock" breaks compilation
> under 32-bit with CONFIG_XEN=y.
>
> /home/konrad/linux-linus/arch/x86/xen/mmu.c: In function ‘xen_setup_kernel_pagetable’:
> /home/konrad/linux-linus/arch/x86/xen/mmu.c:1855: error: expected ‘;’ before ‘)’ token
> /home/konrad/linux-linus/arch/x86/xen/mmu.c:1855: error: expected statement before ‘)’ token
>
> Looking at merge it looks like you added an extra ')'?
>
> This patch below fixes it, which I was thinking to attach it to my tree that I will
> send on Monday to Linus.
>
> From 18ae9edebde83ef358e997e319868d664fb2ddb8 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Sat, 7 Jan 2012 21:27:38 -0500
> Subject: [PATCH] xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> 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
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> arch/x86/xen/mmu.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> 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);

Oops, how did that get through? Sorry about that.

Acked-by: Tejun Heo <tj@kernel.org>

Thank you.

--
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-01-09 17:41    [W:0.034 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site