Re: linux-next: build failure after merge of the final tree (kvm tree related)

Previous thread: linux-next: manual merge of the tip tree with Linus' tree by Stephen Rothwell on Sunday, July 25, 2010 - 8:39 pm. (1 message)

Next thread: linux-next: build failure after merge of the final tree (xen tree related) by Stephen Rothwell on Sunday, July 25, 2010 - 10:10 pm. (1 message)
From: Stephen Rothwell
Date: Sunday, July 25, 2010 - 9:27 pm

Hi all,

After merging the final tree, today's linux-next build (powerpc
ppc44x_defconfig) failed like this:

cc1: warnings being treated as errors
arch/powerpc/kvm/44x_tlb.c: In function 'kvmppc_mmu_map':
arch/powerpc/kvm/44x_tlb.c:319: error: format '%lx' expects type 'long unsigned int', but argument 2 has type 'gfn_t'

Caused by commit 05c07e00b15e00632a2502dcbf253415449e89da ("KVM: Use u64
for frame data types").  I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 Jul 2010 14:25:12 +1000
Subject: [PATCH] kvm: u64's should be printed with %llx

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kvm/44x_tlb.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
index 8123125..9b9b5cd 100644
--- a/arch/powerpc/kvm/44x_tlb.c
+++ b/arch/powerpc/kvm/44x_tlb.c
@@ -316,7 +316,8 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr,
 	gfn = gpaddr >> PAGE_SHIFT;
 	new_page = gfn_to_page(vcpu->kvm, gfn);
 	if (is_error_page(new_page)) {
-		printk(KERN_ERR "Couldn't get guest page for gfn %lx!\n", gfn);
+		printk(KERN_ERR "Couldn't get guest page for gfn %llx!\n",
+			(unsigned long long)gfn);
 		kvm_release_page_clean(new_page);
 		return;
 	}
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
--

From: Stephen Rothwell
Date: Sunday, August 1, 2010 - 5:33 pm

Hi Avi, Marcelo,


Ping?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Avi Kivity
Date: Sunday, August 1, 2010 - 8:40 pm

Sorry.  Applied now, and will appear on next next.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

--

From: Stephen Rothwell
Date: Sunday, August 1, 2010 - 9:25 pm

Hi Avi,


Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Previous thread: linux-next: manual merge of the tip tree with Linus' tree by Stephen Rothwell on Sunday, July 25, 2010 - 8:39 pm. (1 message)

Next thread: linux-next: build failure after merge of the final tree (xen tree related) by Stephen Rothwell on Sunday, July 25, 2010 - 10:10 pm. (1 message)