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

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
Date: Fri, 27 Apr 2012 15:52:54 +1000
Subject: [PATCH] KVM/PPC: do not export things twice

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature