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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

Hi all,

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

In file included from kernel/watchdog.c:27:0:
include/linux/kvm_para.h: In function 'kvm_para_has_feature':
include/linux/kvm_para.h:32:2: error: implicit declaration of function 'kvm_arch_para_features' [-Werror=implicit-function-declaration]

Caused by commit 5d1c0f4a80a6 ("watchdog: add check for suspended vm in
softlockup detector").  This build has no KVM related CONFIG options set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

Hi all,

On Thu, 19 Apr 2012 16:35:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
> 
> In file included from kernel/watchdog.c:27:0:
> include/linux/kvm_para.h: In function 'kvm_para_has_feature':
> include/linux/kvm_para.h:32:2: error: implicit declaration of function 'kvm_arch_para_features' [-Werror=implicit-function-declaration]
> 
> Caused by commit 5d1c0f4a80a6 ("watchdog: add check for suspended vm in
> softlockup detector").  This build has no KVM related CONFIG options set.
> 
> I have reverted that commit for today.

This build failure now belongs to the kvm tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Marcelo Tosatti]

On Fri, Apr 20, 2012 at 10:10:12AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 19 Apr 2012 16:35:35 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the final tree, today's linux-next build (sparc64 defconfig)
> > failed like this:
> > 
> > In file included from kernel/watchdog.c:27:0:
> > include/linux/kvm_para.h: In function 'kvm_para_has_feature':
> > include/linux/kvm_para.h:32:2: error: implicit declaration of function 'kvm_arch_para_features' [-Werror=implicit-function-declaration]
> > 
> > Caused by commit 5d1c0f4a80a6 ("watchdog: add check for suspended vm in
> > softlockup detector").  This build has no KVM related CONFIG options set.
> > 
> > I have reverted that commit for today.
> 
> This build failure now belongs to the kvm tree ...
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au


Stephen,

Can you try the patch below please?



KVM: add kvm_arch_para_features stub to asm-generic/kvm_para.h

Needed by kvm_para_has_feature().

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/include/asm-generic/kvm_para.h b/include/asm-generic/kvm_para.h
index 05ef7e7..9a7bbad 100644
--- a/include/asm-generic/kvm_para.h
+++ b/include/asm-generic/kvm_para.h
@@ -11,4 +11,9 @@ static inline bool kvm_check_and_clear_guest_paused(void)
 	return false;
 }
 
+static inline unsigned int kvm_arch_para_features(void)
+{
+	return 0;
+}
+
 #endif

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 474 bytes --]

Hi Marcelo,

On Thu, 19 Apr 2012 22:14:13 -0300 Marcelo Tosatti <mtosatti@redhat.com> wrote:
>
> Can you try the patch below please?
> 
> KVM: add kvm_arch_para_features stub to asm-generic/kvm_para.h
> 
> Needed by kvm_para_has_feature().
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

That fixes the compilation for me

Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

Hi all,

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

arch/powerpc/kernel/ppc_ksyms.c:194:1: error: redefinition of '__kstrtab_do_IRQ'
arch/powerpc/kernel/ppc_ksyms.c:62:1: note: previous definition of '__kstrtab_do_IRQ' was here

Caused by commit f4601ff93980 ("PPC: Export some interrupt handlers").

I applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Apr 2012 15:52:54 +1000
Subject: [PATCH] KVM/PPC: do not export things twice

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/kernel/ppc_ksyms.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index f6484f2..cace146 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -191,6 +191,8 @@ EXPORT_SYMBOL(__arch_hweight32);
 EXPORT_SYMBOL(__arch_hweight64);
 #endif
 
-EXPORT_SYMBOL_GPL(do_IRQ);
-EXPORT_SYMBOL_GPL(timer_interrupt);
+#ifndef CONFIG_PPC32
+EXPORT_SYMBOL(do_IRQ);
+EXPORT_SYMBOL(timer_interrupt);
+#endif
 EXPORT_SYMBOL_GPL(performance_monitor_exception);
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]