Skip to contentSkip to conversation

Compile errors on 32-bit build due to d4bbf7e7759afc172e2bfbc5c416324590049cdd

PATCH Konrad Rzeszutek Wilk 2 participants 2 messages Jan 8, 2012 – Jan 9, 2012

Subsystems (2)
x86 Xen hypervisor x86
lore
Share & tools
lore

Konrad Rzeszutek Wilk

author
#0 lore raw

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.

Quoted 1 line

From 18ae9edebde83ef358e997e319868d664fb2ddb8 Mon Sep 17 00:00:00 2001

From: Konrad Rzeszutek Wilk <[email protected]>
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 <[email protected]>
---
 arch/x86/xen/mmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/xen/mmu.c +1 -1
index f4bf8aa..58a0e46 100644
@@ -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;
 }
Signature · 1 line
1.7.7.3
Acked-by
#1 lore raw

Hello, Konrad.

Quoted 40 lines · Konrad Rzeszutek Wilk

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 <[email protected]>
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 <[email protected]>
---
 arch/x86/xen/mmu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/xen/mmu.c +0 -0
index f4bf8aa..58a0e46 100644

arch/x86/xen/mmu.c pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd, · line 1855

Quoted 5 lines
arch/x86/xen/mmu.c +1 -1
@@ -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 <[email protected]>

Thank you.

Signature · 1 line
tejun